obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

1266 files changed, 71630 insertions, 0 deletions

diff --git a/libjava/javax/swing/AbstractAction.h b/libjava/javax/swing/AbstractAction.h
new file mode 100644
index 000000000..6f79d0d37
--- /dev/null
+++ b/libjava/javax/swing/AbstractAction.h
@@ -0,0 +1,77 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_AbstractAction__
+#define __javax_swing_AbstractAction__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class AbstractAction;
+        class Icon;
+      namespace event
+      {
+          class SwingPropertyChangeSupport;
+      }
+    }
+  }
+}
+
+class javax::swing::AbstractAction : public ::java::lang::Object
+{
+
+public:
+  AbstractAction();
+  AbstractAction(::java::lang::String *);
+  AbstractAction(::java::lang::String *, ::javax::swing::Icon *);
+public: // actually protected
+  virtual ::java::lang::Object * clone();
+public:
+  virtual ::java::lang::Object * getValue(::java::lang::String *);
+  virtual void putValue(::java::lang::String *, ::java::lang::Object *);
+  virtual jboolean isEnabled();
+  virtual void setEnabled(jboolean);
+  virtual JArray< ::java::lang::Object * > * getKeys();
+public: // actually protected
+  virtual void firePropertyChange(::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *);
+private:
+  void firePropertyChange(::java::lang::String *, jboolean, jboolean);
+public:
+  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
+  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
+  virtual JArray< ::java::beans::PropertyChangeListener * > * getPropertyChangeListeners();
+  virtual void actionPerformed(::java::awt::event::ActionEvent *) = 0;
+private:
+  static const jlong serialVersionUID = -6803159439231523484LL;
+public: // actually protected
+  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) enabled;
+  ::javax::swing::event::SwingPropertyChangeSupport * changeSupport;
+private:
+  ::java::util::HashMap * store;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_AbstractAction__
diff --git a/libjava/javax/swing/AbstractButton$1.h b/libjava/javax/swing/AbstractButton$1.h
new file mode 100644
index 000000000..e64e2c911
--- /dev/null
+++ b/libjava/javax/swing/AbstractButton$1.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_AbstractButton$1__
+#define __javax_swing_AbstractButton$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class AbstractButton;
+        class AbstractButton$1;
+    }
+  }
+}
+
+class javax::swing::AbstractButton$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  AbstractButton$1(::javax::swing::AbstractButton *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::AbstractButton * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_AbstractButton$1__
diff --git a/libjava/javax/swing/AbstractButton$AccessibleAbstractButton.h b/libjava/javax/swing/AbstractButton$AccessibleAbstractButton.h
new file mode 100644
index 000000000..fd5ea169d
--- /dev/null
+++ b/libjava/javax/swing/AbstractButton$AccessibleAbstractButton.h
@@ -0,0 +1,84 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_AbstractButton$AccessibleAbstractButton__
+#define __javax_swing_AbstractButton$AccessibleAbstractButton__
+
+#pragma interface
+
+#include <javax/swing/JComponent$AccessibleJComponent.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Point;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleAction;
+        class AccessibleIcon;
+        class AccessibleRelationSet;
+        class AccessibleStateSet;
+        class AccessibleText;
+        class AccessibleValue;
+    }
+    namespace swing
+    {
+        class AbstractButton;
+        class AbstractButton$AccessibleAbstractButton;
+      namespace text
+      {
+          class AttributeSet;
+      }
+    }
+  }
+}
+
+class javax::swing::AbstractButton$AccessibleAbstractButton : public ::javax::swing::JComponent$AccessibleJComponent
+{
+
+public: // actually protected
+  AbstractButton$AccessibleAbstractButton(::javax::swing::AbstractButton *);
+public:
+  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
+  virtual ::java::lang::String * getAccessibleName();
+  virtual JArray< ::javax::accessibility::AccessibleIcon * > * getAccessibleIcon();
+  virtual ::javax::accessibility::AccessibleRelationSet * getAccessibleRelationSet();
+  virtual ::javax::accessibility::AccessibleAction * getAccessibleAction();
+  virtual ::javax::accessibility::AccessibleValue * getAccessibleValue();
+  virtual jint getAccessibleActionCount();
+  virtual ::java::lang::String * getAccessibleActionDescription(jint);
+  virtual jboolean doAccessibleAction(jint);
+  virtual ::java::lang::Number * getCurrentAccessibleValue();
+  virtual jboolean setCurrentAccessibleValue(::java::lang::Number *);
+  virtual ::java::lang::Number * getMinimumAccessibleValue();
+  virtual ::java::lang::Number * getMaximumAccessibleValue();
+  virtual ::javax::accessibility::AccessibleText * getAccessibleText();
+  virtual jint getIndexAtPoint(::java::awt::Point *);
+  virtual ::java::awt::Rectangle * getCharacterBounds(jint);
+  virtual jint getCharCount();
+  virtual jint getCaretPosition();
+  virtual ::java::lang::String * getAtIndex(jint, jint);
+  virtual ::java::lang::String * getAfterIndex(jint, jint);
+  virtual ::java::lang::String * getBeforeIndex(jint, jint);
+  virtual ::javax::swing::text::AttributeSet * getCharacterAttribute(jint);
+  virtual jint getSelectionStart();
+  virtual jint getSelectionEnd();
+  virtual ::java::lang::String * getSelectedText();
+private:
+  static const jlong serialVersionUID = -5673062525319836790LL;
+public: // actually package-private
+  ::javax::swing::AbstractButton * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_AbstractButton$AccessibleAbstractButton__
diff --git a/libjava/javax/swing/AbstractButton$ButtonChangeListener.h b/libjava/javax/swing/AbstractButton$ButtonChangeListener.h
new file mode 100644
index 000000000..e291daa77
--- /dev/null
+++ b/libjava/javax/swing/AbstractButton$ButtonChangeListener.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_AbstractButton$ButtonChangeListener__
+#define __javax_swing_AbstractButton$ButtonChangeListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class AbstractButton;
+        class AbstractButton$ButtonChangeListener;
+      namespace event
+      {
+          class ChangeEvent;
+      }
+    }
+  }
+}
+
+class javax::swing::AbstractButton$ButtonChangeListener : public ::java::lang::Object
+{
+
+public: // actually package-private
+  AbstractButton$ButtonChangeListener(::javax::swing::AbstractButton *);
+public:
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+private:
+  static const jlong serialVersionUID = 1471056094226600578LL;
+public: // actually package-private
+  ::javax::swing::AbstractButton * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_AbstractButton$ButtonChangeListener__
diff --git a/libjava/javax/swing/AbstractButton$EventHandler.h b/libjava/javax/swing/AbstractButton$EventHandler.h
new file mode 100644
index 000000000..148efd611
--- /dev/null
+++ b/libjava/javax/swing/AbstractButton$EventHandler.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_AbstractButton$EventHandler__
+#define __javax_swing_AbstractButton$EventHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+          class ItemEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class AbstractButton;
+        class AbstractButton$EventHandler;
+      namespace event
+      {
+          class ChangeEvent;
+      }
+    }
+  }
+}
+
+class javax::swing::AbstractButton$EventHandler : public ::java::lang::Object
+{
+
+  AbstractButton$EventHandler(::javax::swing::AbstractButton *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+  virtual void itemStateChanged(::java::awt::event::ItemEvent *);
+public: // actually package-private
+  AbstractButton$EventHandler(::javax::swing::AbstractButton *, ::javax::swing::AbstractButton$EventHandler *);
+  ::javax::swing::AbstractButton * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_AbstractButton$EventHandler__
diff --git a/libjava/javax/swing/AbstractButton.h b/libjava/javax/swing/AbstractButton.h
new file mode 100644
index 000000000..82cf58823
--- /dev/null
+++ b/libjava/javax/swing/AbstractButton.h
@@ -0,0 +1,227 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_AbstractButton__
+#define __javax_swing_AbstractButton__
+
+#pragma interface
+
+#include <javax/swing/JComponent.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Image;
+        class Insets;
+        class LayoutManager;
+      namespace event
+      {
+          class ActionEvent;
+          class ActionListener;
+          class ItemEvent;
+          class ItemListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class AbstractButton;
+        class AbstractButton$EventHandler;
+        class Action;
+        class ButtonModel;
+        class Icon;
+      namespace event
+      {
+          class ChangeEvent;
+          class ChangeListener;
+      }
+      namespace plaf
+      {
+          class ButtonUI;
+      }
+    }
+  }
+}
+
+class javax::swing::AbstractButton : public ::javax::swing::JComponent
+{
+
+public:
+  AbstractButton();
+  virtual ::javax::swing::ButtonModel * getModel();
+  virtual void setModel(::javax::swing::ButtonModel *);
+public: // actually protected
+  virtual void init(::java::lang::String *, ::javax::swing::Icon *);
+public:
+  virtual ::java::lang::String * getActionCommand();
+  virtual void setActionCommand(::java::lang::String *);
+  virtual void addActionListener(::java::awt::event::ActionListener *);
+  virtual void removeActionListener(::java::awt::event::ActionListener *);
+  virtual JArray< ::java::awt::event::ActionListener * > * getActionListeners();
+  virtual void addItemListener(::java::awt::event::ItemListener *);
+  virtual void removeItemListener(::java::awt::event::ItemListener *);
+  virtual JArray< ::java::awt::event::ItemListener * > * getItemListeners();
+  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
+  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
+  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
+public: // actually protected
+  virtual void fireItemStateChanged(::java::awt::event::ItemEvent *);
+  virtual void fireActionPerformed(::java::awt::event::ActionEvent *);
+  virtual void fireStateChanged();
+public:
+  virtual jint getMnemonic();
+  virtual void setMnemonic(jchar);
+  virtual void setMnemonic(jint);
+  virtual void setDisplayedMnemonicIndex(jint);
+  virtual jint getDisplayedMnemonicIndex();
+  virtual void setRolloverEnabled(jboolean);
+  virtual jboolean isRolloverEnabled();
+  virtual void setSelected(jboolean);
+  virtual jboolean isSelected();
+  virtual void setEnabled(jboolean);
+  virtual jint getHorizontalAlignment();
+  virtual void setHorizontalAlignment(jint);
+  virtual jint getHorizontalTextPosition();
+  virtual void setHorizontalTextPosition(jint);
+  virtual jint getVerticalAlignment();
+  virtual void setVerticalAlignment(jint);
+  virtual jint getVerticalTextPosition();
+  virtual void setVerticalTextPosition(jint);
+  virtual jboolean isBorderPainted();
+  virtual void setBorderPainted(jboolean);
+  virtual ::javax::swing::Action * getAction();
+  virtual void setAction(::javax::swing::Action *);
+  virtual ::javax::swing::Icon * getIcon();
+  virtual void setIcon(::javax::swing::Icon *);
+  virtual ::java::lang::String * getText();
+  virtual void setLabel(::java::lang::String *);
+  virtual ::java::lang::String * getLabel();
+  virtual void setText(::java::lang::String *);
+  virtual void setIconTextGap(jint);
+  virtual jint getIconTextGap();
+  virtual ::java::awt::Insets * getMargin();
+  virtual void setMargin(::java::awt::Insets *);
+  virtual ::javax::swing::Icon * getPressedIcon();
+  virtual void setPressedIcon(::javax::swing::Icon *);
+  virtual ::javax::swing::Icon * getDisabledIcon();
+  virtual void setDisabledIcon(::javax::swing::Icon *);
+  virtual jboolean isFocusPainted();
+  virtual void setFocusPainted(jboolean);
+public: // actually protected
+  virtual jint checkHorizontalKey(jint, ::java::lang::String *);
+  virtual jint checkVerticalKey(jint, ::java::lang::String *);
+  virtual void configurePropertiesFromAction(::javax::swing::Action *);
+  virtual ::java::awt::event::ActionListener * createActionListener();
+  virtual ::java::beans::PropertyChangeListener * createActionPropertyChangeListener(::javax::swing::Action *);
+  virtual ::javax::swing::event::ChangeListener * createChangeListener();
+  virtual ::java::awt::event::ItemListener * createItemListener();
+public:
+  virtual void doClick();
+  virtual void doClick(jint);
+  virtual ::javax::swing::Icon * getDisabledSelectedIcon();
+  virtual void setDisabledSelectedIcon(::javax::swing::Icon *);
+  virtual ::javax::swing::Icon * getRolloverIcon();
+  virtual void setRolloverIcon(::javax::swing::Icon *);
+  virtual ::javax::swing::Icon * getRolloverSelectedIcon();
+  virtual void setRolloverSelectedIcon(::javax::swing::Icon *);
+  virtual ::javax::swing::Icon * getSelectedIcon();
+  virtual void setSelectedIcon(::javax::swing::Icon *);
+  virtual JArray< ::java::lang::Object * > * getSelectedObjects();
+  virtual jboolean imageUpdate(::java::awt::Image *, jint, jint, jint, jint, jint);
+  virtual jboolean isContentAreaFilled();
+  virtual void setContentAreaFilled(jboolean);
+public: // actually protected
+  virtual void paintBorder(::java::awt::Graphics *);
+  virtual ::java::lang::String * paramString();
+public:
+  virtual void setUI(::javax::swing::plaf::ButtonUI *);
+  virtual ::javax::swing::plaf::ButtonUI * getUI();
+  virtual void updateUI();
+  virtual jlong getMultiClickThreshhold();
+  virtual void setMultiClickThreshhold(jlong);
+public: // actually protected
+  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
+public:
+  virtual void setLayout(::java::awt::LayoutManager *);
+public: // actually package-private
+  virtual void setUIProperty(::java::lang::String *, ::java::lang::Object *);
+  virtual ::javax::swing::AbstractButton$EventHandler * getEventHandler();
+private:
+  static const jlong serialVersionUID = -937921345538462020LL;
+public: // actually package-private
+  ::javax::swing::Icon * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) default_icon;
+  ::javax::swing::Icon * pressed_icon;
+  ::javax::swing::Icon * disabledIcon;
+  ::javax::swing::Icon * selectedIcon;
+  ::javax::swing::Icon * disabledSelectedIcon;
+  ::javax::swing::Icon * rolloverIcon;
+  ::javax::swing::Icon * rolloverSelectedIcon;
+  ::javax::swing::Icon * current_icon;
+  ::java::lang::String * text;
+  jint iconTextGap;
+  jint verticalAlignment;
+  jint horizontalAlignment;
+  jint horizontalTextPosition;
+  jint verticalTextPosition;
+  jboolean borderPainted;
+  jboolean focusPainted;
+  jboolean contentAreaFilled;
+  jboolean rollOverEnabled;
+  ::javax::swing::Action * action;
+public: // actually protected
+  ::javax::swing::ButtonModel * model;
+public: // actually package-private
+  ::java::awt::Insets * margin;
+  jint mnemonicIndex;
+public: // actually protected
+  ::java::awt::event::ActionListener * actionListener;
+  ::java::awt::event::ItemListener * itemListener;
+  ::javax::swing::event::ChangeListener * changeListener;
+private:
+  ::javax::swing::AbstractButton$EventHandler * eventHandler;
+public: // actually package-private
+  jlong multiClickThreshhold;
+  ::java::beans::PropertyChangeListener * actionPropertyChangeListener;
+public: // actually protected
+  ::javax::swing::event::ChangeEvent * changeEvent;
+private:
+  jboolean clientBorderPaintedSet;
+  jboolean clientRolloverEnabledSet;
+  jboolean clientIconTextGapSet;
+  jboolean clientContentAreaFilledSet;
+public:
+  static ::java::lang::String * BORDER_PAINTED_CHANGED_PROPERTY;
+  static ::java::lang::String * CONTENT_AREA_FILLED_CHANGED_PROPERTY;
+  static ::java::lang::String * DISABLED_ICON_CHANGED_PROPERTY;
+  static ::java::lang::String * DISABLED_SELECTED_ICON_CHANGED_PROPERTY;
+  static ::java::lang::String * FOCUS_PAINTED_CHANGED_PROPERTY;
+  static ::java::lang::String * HORIZONTAL_ALIGNMENT_CHANGED_PROPERTY;
+  static ::java::lang::String * HORIZONTAL_TEXT_POSITION_CHANGED_PROPERTY;
+  static ::java::lang::String * ICON_CHANGED_PROPERTY;
+  static ::java::lang::String * MARGIN_CHANGED_PROPERTY;
+  static ::java::lang::String * MNEMONIC_CHANGED_PROPERTY;
+  static ::java::lang::String * MODEL_CHANGED_PROPERTY;
+  static ::java::lang::String * PRESSED_ICON_CHANGED_PROPERTY;
+  static ::java::lang::String * ROLLOVER_ENABLED_CHANGED_PROPERTY;
+  static ::java::lang::String * ROLLOVER_ICON_CHANGED_PROPERTY;
+  static ::java::lang::String * ROLLOVER_SELECTED_ICON_CHANGED_PROPERTY;
+  static ::java::lang::String * SELECTED_ICON_CHANGED_PROPERTY;
+  static ::java::lang::String * TEXT_CHANGED_PROPERTY;
+  static ::java::lang::String * VERTICAL_ALIGNMENT_CHANGED_PROPERTY;
+  static ::java::lang::String * VERTICAL_TEXT_POSITION_CHANGED_PROPERTY;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_AbstractButton__
diff --git a/libjava/javax/swing/AbstractCellEditor.h b/libjava/javax/swing/AbstractCellEditor.h
new file mode 100644
index 000000000..a3aae0dbd
--- /dev/null
+++ b/libjava/javax/swing/AbstractCellEditor.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_AbstractCellEditor__
+#define __javax_swing_AbstractCellEditor__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class AbstractCellEditor;
+      namespace event
+      {
+          class CellEditorListener;
+          class ChangeEvent;
+          class EventListenerList;
+      }
+    }
+  }
+}
+
+class javax::swing::AbstractCellEditor : public ::java::lang::Object
+{
+
+public:
+  AbstractCellEditor();
+  virtual jboolean isCellEditable(::java::util::EventObject *);
+  virtual jboolean shouldSelectCell(::java::util::EventObject *);
+  virtual jboolean stopCellEditing();
+  virtual void cancelCellEditing();
+  virtual void addCellEditorListener(::javax::swing::event::CellEditorListener *);
+  virtual void removeCellEditorListener(::javax::swing::event::CellEditorListener *);
+  virtual JArray< ::javax::swing::event::CellEditorListener * > * getCellEditorListeners();
+public: // actually protected
+  virtual void fireEditingStopped();
+  virtual void fireEditingCanceled();
+public:
+  virtual ::java::lang::Object * getCellEditorValue() = 0;
+private:
+  static const jlong serialVersionUID = -1048006551406220959LL;
+public: // actually protected
+  ::javax::swing::event::EventListenerList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) listenerList;
+  ::javax::swing::event::ChangeEvent * changeEvent;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_AbstractCellEditor__
diff --git a/libjava/javax/swing/AbstractListModel.h b/libjava/javax/swing/AbstractListModel.h
new file mode 100644
index 000000000..5e6eb5476
--- /dev/null
+++ b/libjava/javax/swing/AbstractListModel.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_AbstractListModel__
+#define __javax_swing_AbstractListModel__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class AbstractListModel;
+      namespace event
+      {
+          class EventListenerList;
+          class ListDataListener;
+      }
+    }
+  }
+}
+
+class javax::swing::AbstractListModel : public ::java::lang::Object
+{
+
+public:
+  AbstractListModel();
+  virtual void addListDataListener(::javax::swing::event::ListDataListener *);
+  virtual void removeListDataListener(::javax::swing::event::ListDataListener *);
+public: // actually protected
+  virtual void fireContentsChanged(::java::lang::Object *, jint, jint);
+  virtual void fireIntervalAdded(::java::lang::Object *, jint, jint);
+  virtual void fireIntervalRemoved(::java::lang::Object *, jint, jint);
+public:
+  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
+  virtual JArray< ::javax::swing::event::ListDataListener * > * getListDataListeners();
+  virtual jint getSize() = 0;
+  virtual ::java::lang::Object * getElementAt(jint) = 0;
+private:
+  static const jlong serialVersionUID = -3285184064379168730LL;
+public: // actually protected
+  ::javax::swing::event::EventListenerList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) listenerList;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_AbstractListModel__
diff --git a/libjava/javax/swing/AbstractSpinnerModel.h b/libjava/javax/swing/AbstractSpinnerModel.h
new file mode 100644
index 000000000..dde4ac870
--- /dev/null
+++ b/libjava/javax/swing/AbstractSpinnerModel.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_AbstractSpinnerModel__
+#define __javax_swing_AbstractSpinnerModel__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class AbstractSpinnerModel;
+      namespace event
+      {
+          class ChangeEvent;
+          class ChangeListener;
+          class EventListenerList;
+      }
+    }
+  }
+}
+
+class javax::swing::AbstractSpinnerModel : public ::java::lang::Object
+{
+
+public:
+  AbstractSpinnerModel();
+  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
+  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
+  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
+  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
+public: // actually protected
+  virtual void fireStateChanged();
+public:
+  virtual void setValue(::java::lang::Object *) = 0;
+  virtual ::java::lang::Object * getValue() = 0;
+  virtual ::java::lang::Object * getNextValue() = 0;
+  virtual ::java::lang::Object * getPreviousValue() = 0;
+private:
+  ::javax::swing::event::ChangeEvent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) changeEvent;
+public: // actually protected
+  ::javax::swing::event::EventListenerList * listenerList;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_AbstractSpinnerModel__
diff --git a/libjava/javax/swing/Action.h b/libjava/javax/swing/Action.h
new file mode 100644
index 000000000..b3a42f4f0
--- /dev/null
+++ b/libjava/javax/swing/Action.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_Action__
+#define __javax_swing_Action__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Action;
+    }
+  }
+}
+
+class javax::swing::Action : public ::java::lang::Object
+{
+
+public:
+  virtual ::java::lang::Object * getValue(::java::lang::String *) = 0;
+  virtual void putValue(::java::lang::String *, ::java::lang::Object *) = 0;
+  virtual jboolean isEnabled() = 0;
+  virtual void setEnabled(jboolean) = 0;
+  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *) = 0;
+  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *) = 0;
+  virtual void actionPerformed(::java::awt::event::ActionEvent *) = 0;
+  static ::java::lang::String * DEFAULT;
+  static ::java::lang::String * LONG_DESCRIPTION;
+  static ::java::lang::String * NAME;
+  static ::java::lang::String * SHORT_DESCRIPTION;
+  static ::java::lang::String * SMALL_ICON;
+  static ::java::lang::String * ACCELERATOR_KEY;
+  static ::java::lang::String * ACTION_COMMAND_KEY;
+  static ::java::lang::String * MNEMONIC_KEY;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_Action__
diff --git a/libjava/javax/swing/ActionMap.h b/libjava/javax/swing/ActionMap.h
new file mode 100644
index 000000000..92e8e039a
--- /dev/null
+++ b/libjava/javax/swing/ActionMap.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_ActionMap__
+#define __javax_swing_ActionMap__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class Action;
+        class ActionMap;
+    }
+  }
+}
+
+class javax::swing::ActionMap : public ::java::lang::Object
+{
+
+public:
+  ActionMap();
+  virtual ::javax::swing::Action * get(::java::lang::Object *);
+  virtual void put(::java::lang::Object *, ::javax::swing::Action *);
+  virtual void remove(::java::lang::Object *);
+  virtual ::javax::swing::ActionMap * getParent();
+  virtual void setParent(::javax::swing::ActionMap *);
+  virtual jint size();
+  virtual void clear();
+  virtual JArray< ::java::lang::Object * > * keys();
+  virtual JArray< ::java::lang::Object * > * allKeys();
+private:
+  static const jlong serialVersionUID = -6277518704513986346LL;
+  ::java::util::Map * __attribute__((aligned(__alignof__( ::java::lang::Object)))) actionMap;
+  ::javax::swing::ActionMap * parent;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_ActionMap__
diff --git a/libjava/javax/swing/BorderFactory.h b/libjava/javax/swing/BorderFactory.h
new file mode 100644
index 000000000..2a84d3366
--- /dev/null
+++ b/libjava/javax/swing/BorderFactory.h
@@ -0,0 +1,68 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_BorderFactory__
+#define __javax_swing_BorderFactory__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Font;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class BorderFactory;
+        class Icon;
+      namespace border
+      {
+          class Border;
+          class CompoundBorder;
+          class MatteBorder;
+          class TitledBorder;
+      }
+    }
+  }
+}
+
+class javax::swing::BorderFactory : public ::java::lang::Object
+{
+
+  BorderFactory();
+public:
+  static ::javax::swing::border::Border * createLineBorder(::java::awt::Color *);
+  static ::javax::swing::border::Border * createLineBorder(::java::awt::Color *, jint);
+  static ::javax::swing::border::Border * createRaisedBevelBorder();
+  static ::javax::swing::border::Border * createLoweredBevelBorder();
+  static ::javax::swing::border::Border * createBevelBorder(jint);
+  static ::javax::swing::border::Border * createBevelBorder(jint, ::java::awt::Color *, ::java::awt::Color *);
+  static ::javax::swing::border::Border * createBevelBorder(jint, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
+  static ::javax::swing::border::Border * createEtchedBorder();
+  static ::javax::swing::border::Border * createEtchedBorder(jint);
+  static ::javax::swing::border::Border * createEtchedBorder(::java::awt::Color *, ::java::awt::Color *);
+  static ::javax::swing::border::Border * createEtchedBorder(jint, ::java::awt::Color *, ::java::awt::Color *);
+  static ::javax::swing::border::TitledBorder * createTitledBorder(::java::lang::String *);
+  static ::javax::swing::border::TitledBorder * createTitledBorder(::javax::swing::border::Border *);
+  static ::javax::swing::border::TitledBorder * createTitledBorder(::javax::swing::border::Border *, ::java::lang::String *);
+  static ::javax::swing::border::TitledBorder * createTitledBorder(::javax::swing::border::Border *, ::java::lang::String *, jint, jint);
+  static ::javax::swing::border::TitledBorder * createTitledBorder(::javax::swing::border::Border *, ::java::lang::String *, jint, jint, ::java::awt::Font *);
+  static ::javax::swing::border::TitledBorder * createTitledBorder(::javax::swing::border::Border *, ::java::lang::String *, jint, jint, ::java::awt::Font *, ::java::awt::Color *);
+  static ::javax::swing::border::Border * createEmptyBorder();
+  static ::javax::swing::border::Border * createEmptyBorder(jint, jint, jint, jint);
+  static ::javax::swing::border::CompoundBorder * createCompoundBorder();
+  static ::javax::swing::border::CompoundBorder * createCompoundBorder(::javax::swing::border::Border *, ::javax::swing::border::Border *);
+  static ::javax::swing::border::MatteBorder * createMatteBorder(jint, jint, jint, jint, ::java::awt::Color *);
+  static ::javax::swing::border::MatteBorder * createMatteBorder(jint, jint, jint, jint, ::javax::swing::Icon *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_BorderFactory__
diff --git a/libjava/javax/swing/BoundedRangeModel.h b/libjava/javax/swing/BoundedRangeModel.h
new file mode 100644
index 000000000..6842157c2
--- /dev/null
+++ b/libjava/javax/swing/BoundedRangeModel.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_BoundedRangeModel__
+#define __javax_swing_BoundedRangeModel__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class BoundedRangeModel;
+      namespace event
+      {
+          class ChangeListener;
+      }
+    }
+  }
+}
+
+class javax::swing::BoundedRangeModel : public ::java::lang::Object
+{
+
+public:
+  virtual jint getValue() = 0;
+  virtual void setValue(jint) = 0;
+  virtual jint getMinimum() = 0;
+  virtual void setMinimum(jint) = 0;
+  virtual jint getMaximum() = 0;
+  virtual void setMaximum(jint) = 0;
+  virtual jboolean getValueIsAdjusting() = 0;
+  virtual void setValueIsAdjusting(jboolean) = 0;
+  virtual jint getExtent() = 0;
+  virtual void setExtent(jint) = 0;
+  virtual void setRangeProperties(jint, jint, jint, jint, jboolean) = 0;
+  virtual void addChangeListener(::javax::swing::event::ChangeListener *) = 0;
+  virtual void removeChangeListener(::javax::swing::event::ChangeListener *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_BoundedRangeModel__
diff --git a/libjava/javax/swing/Box$AccessibleBox.h b/libjava/javax/swing/Box$AccessibleBox.h
new file mode 100644
index 000000000..eb552a185
--- /dev/null
+++ b/libjava/javax/swing/Box$AccessibleBox.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_Box$AccessibleBox__
+#define __javax_swing_Box$AccessibleBox__
+
+#pragma interface
+
+#include <java/awt/Container$AccessibleAWTContainer.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleRole;
+    }
+    namespace swing
+    {
+        class Box;
+        class Box$AccessibleBox;
+    }
+  }
+}
+
+class javax::swing::Box$AccessibleBox : public ::java::awt::Container$AccessibleAWTContainer
+{
+
+public: // actually protected
+  Box$AccessibleBox(::javax::swing::Box *);
+public:
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+private:
+  static const jlong serialVersionUID = -7775079816389931944LL;
+public: // actually package-private
+  ::javax::swing::Box * __attribute__((aligned(__alignof__( ::java::awt::Container$AccessibleAWTContainer)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_Box$AccessibleBox__
diff --git a/libjava/javax/swing/Box$Filler$AccessibleBoxFiller.h b/libjava/javax/swing/Box$Filler$AccessibleBoxFiller.h
new file mode 100644
index 000000000..66440c344
--- /dev/null
+++ b/libjava/javax/swing/Box$Filler$AccessibleBoxFiller.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_Box$Filler$AccessibleBoxFiller__
+#define __javax_swing_Box$Filler$AccessibleBoxFiller__
+
+#pragma interface
+
+#include <java/awt/Component$AccessibleAWTComponent.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleRole;
+    }
+    namespace swing
+    {
+        class Box$Filler;
+        class Box$Filler$AccessibleBoxFiller;
+    }
+  }
+}
+
+class javax::swing::Box$Filler$AccessibleBoxFiller : public ::java::awt::Component$AccessibleAWTComponent
+{
+
+public: // actually protected
+  Box$Filler$AccessibleBoxFiller(::javax::swing::Box$Filler *);
+public:
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+private:
+  static const jlong serialVersionUID = 164963348357479321LL;
+public: // actually package-private
+  ::javax::swing::Box$Filler * __attribute__((aligned(__alignof__( ::java::awt::Component$AccessibleAWTComponent)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_Box$Filler$AccessibleBoxFiller__
diff --git a/libjava/javax/swing/Box$Filler.h b/libjava/javax/swing/Box$Filler.h
new file mode 100644
index 000000000..a16dc8150
--- /dev/null
+++ b/libjava/javax/swing/Box$Filler.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_Box$Filler__
+#define __javax_swing_Box$Filler__
+
+#pragma interface
+
+#include <javax/swing/JComponent.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class Box$Filler;
+    }
+  }
+}
+
+class javax::swing::Box$Filler : public ::javax::swing::JComponent
+{
+
+public:
+  Box$Filler(::java::awt::Dimension *, ::java::awt::Dimension *, ::java::awt::Dimension *);
+  virtual void changeShape(::java::awt::Dimension *, ::java::awt::Dimension *, ::java::awt::Dimension *);
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+  virtual ::java::awt::Dimension * getMaximumSize();
+  virtual ::java::awt::Dimension * getMinimumSize();
+  virtual ::java::awt::Dimension * getPreferredSize();
+private:
+  static const jlong serialVersionUID = -1204263191910183998LL;
+  ::java::awt::Dimension * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) min;
+  ::java::awt::Dimension * pref;
+  ::java::awt::Dimension * max;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_Box$Filler__
diff --git a/libjava/javax/swing/Box.h b/libjava/javax/swing/Box.h
new file mode 100644
index 000000000..29538a6ee
--- /dev/null
+++ b/libjava/javax/swing/Box.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_Box__
+#define __javax_swing_Box__
+
+#pragma interface
+
+#include <javax/swing/JComponent.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Dimension;
+        class LayoutManager;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class Box;
+    }
+  }
+}
+
+class javax::swing::Box : public ::javax::swing::JComponent
+{
+
+public:
+  Box(jint);
+  static ::java::awt::Component * createGlue();
+  static ::javax::swing::Box * createHorizontalBox();
+  static ::java::awt::Component * createHorizontalGlue();
+  static ::java::awt::Component * createHorizontalStrut(jint);
+  static ::java::awt::Component * createRigidArea(::java::awt::Dimension *);
+  static ::javax::swing::Box * createVerticalBox();
+  static ::java::awt::Component * createVerticalGlue();
+  static ::java::awt::Component * createVerticalStrut(jint);
+  virtual void setLayout(::java::awt::LayoutManager *);
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+private:
+  static const jlong serialVersionUID = 1525417495883046342LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_Box__
diff --git a/libjava/javax/swing/BoxLayout.h b/libjava/javax/swing/BoxLayout.h
new file mode 100644
index 000000000..c60bb8dd9
--- /dev/null
+++ b/libjava/javax/swing/BoxLayout.h
@@ -0,0 +1,76 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_BoxLayout__
+#define __javax_swing_BoxLayout__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class BoxLayout;
+        class SizeRequirements;
+    }
+  }
+}
+
+class javax::swing::BoxLayout : public ::java::lang::Object
+{
+
+public:
+  BoxLayout(::java::awt::Container *, jint);
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+  virtual void removeLayoutComponent(::java::awt::Component *);
+private:
+  jboolean isHorizontalIn(::java::awt::Container *);
+public:
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual void layoutContainer(::java::awt::Container *);
+  virtual void addLayoutComponent(::java::awt::Component *, ::java::lang::Object *);
+  virtual jfloat getLayoutAlignmentX(::java::awt::Container *);
+  virtual jfloat getLayoutAlignmentY(::java::awt::Container *);
+  virtual void invalidateLayout(::java::awt::Container *);
+  virtual ::java::awt::Dimension * maximumLayoutSize(::java::awt::Container *);
+private:
+  void checkTotalRequirements();
+  void checkRequirements();
+  void checkLayout();
+public:
+  static const jint X_AXIS = 0;
+  static const jint Y_AXIS = 1;
+  static const jint LINE_AXIS = 2;
+  static const jint PAGE_AXIS = 3;
+private:
+  static const jlong serialVersionUID = -2474455742719112368LL;
+  ::java::awt::Container * __attribute__((aligned(__alignof__( ::java::lang::Object)))) container;
+  jint way;
+  JArray< ::javax::swing::SizeRequirements * > * xChildren;
+  JArray< ::javax::swing::SizeRequirements * > * yChildren;
+  ::javax::swing::SizeRequirements * xTotal;
+  ::javax::swing::SizeRequirements * yTotal;
+  JArray< jint > * offsetsX;
+  JArray< jint > * offsetsY;
+  JArray< jint > * spansX;
+  JArray< jint > * spansY;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_BoxLayout__
diff --git a/libjava/javax/swing/ButtonGroup.h b/libjava/javax/swing/ButtonGroup.h
new file mode 100644
index 000000000..68f383ac6
--- /dev/null
+++ b/libjava/javax/swing/ButtonGroup.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_ButtonGroup__
+#define __javax_swing_ButtonGroup__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class AbstractButton;
+        class ButtonGroup;
+        class ButtonModel;
+    }
+  }
+}
+
+class javax::swing::ButtonGroup : public ::java::lang::Object
+{
+
+public:
+  ButtonGroup();
+  virtual void add(::javax::swing::AbstractButton *);
+  virtual void remove(::javax::swing::AbstractButton *);
+  virtual ::java::util::Enumeration * getElements();
+  virtual ::javax::swing::ButtonModel * getSelection();
+public: // actually package-private
+  virtual ::javax::swing::AbstractButton * findButton(::javax::swing::ButtonModel *);
+public:
+  virtual void setSelected(::javax::swing::ButtonModel *, jboolean);
+  virtual jboolean isSelected(::javax::swing::ButtonModel *);
+  virtual jint getButtonCount();
+private:
+  static const jlong serialVersionUID = 4259076101881721375LL;
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buttons;
+public: // actually package-private
+  ::javax::swing::ButtonModel * sel;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_ButtonGroup__
diff --git a/libjava/javax/swing/ButtonModel.h b/libjava/javax/swing/ButtonModel.h
new file mode 100644
index 000000000..5f137a654
--- /dev/null
+++ b/libjava/javax/swing/ButtonModel.h
@@ -0,0 +1,68 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_ButtonModel__
+#define __javax_swing_ButtonModel__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionListener;
+          class ItemListener;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ButtonGroup;
+        class ButtonModel;
+      namespace event
+      {
+          class ChangeListener;
+      }
+    }
+  }
+}
+
+class javax::swing::ButtonModel : public ::java::lang::Object
+{
+
+public:
+  virtual jboolean isArmed() = 0;
+  virtual void setArmed(jboolean) = 0;
+  virtual jboolean isEnabled() = 0;
+  virtual void setEnabled(jboolean) = 0;
+  virtual void setPressed(jboolean) = 0;
+  virtual jboolean isPressed() = 0;
+  virtual void removeActionListener(::java::awt::event::ActionListener *) = 0;
+  virtual void addActionListener(::java::awt::event::ActionListener *) = 0;
+  virtual void addItemListener(::java::awt::event::ItemListener *) = 0;
+  virtual void removeItemListener(::java::awt::event::ItemListener *) = 0;
+  virtual void addChangeListener(::javax::swing::event::ChangeListener *) = 0;
+  virtual void removeChangeListener(::javax::swing::event::ChangeListener *) = 0;
+  virtual void setRollover(jboolean) = 0;
+  virtual jboolean isRollover() = 0;
+  virtual jint getMnemonic() = 0;
+  virtual void setMnemonic(jint) = 0;
+  virtual void setActionCommand(::java::lang::String *) = 0;
+  virtual ::java::lang::String * getActionCommand() = 0;
+  virtual void setGroup(::javax::swing::ButtonGroup *) = 0;
+  virtual void setSelected(jboolean) = 0;
+  virtual jboolean isSelected() = 0;
+  virtual JArray< ::java::lang::Object * > * getSelectedObjects() = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_ButtonModel__
diff --git a/libjava/javax/swing/CellEditor.h b/libjava/javax/swing/CellEditor.h
new file mode 100644
index 000000000..63e9c8b77
--- /dev/null
+++ b/libjava/javax/swing/CellEditor.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_CellEditor__
+#define __javax_swing_CellEditor__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class CellEditor;
+      namespace event
+      {
+          class CellEditorListener;
+      }
+    }
+  }
+}
+
+class javax::swing::CellEditor : public ::java::lang::Object
+{
+
+public:
+  virtual ::java::lang::Object * getCellEditorValue() = 0;
+  virtual jboolean isCellEditable(::java::util::EventObject *) = 0;
+  virtual jboolean shouldSelectCell(::java::util::EventObject *) = 0;
+  virtual jboolean stopCellEditing() = 0;
+  virtual void cancelCellEditing() = 0;
+  virtual void addCellEditorListener(::javax::swing::event::CellEditorListener *) = 0;
+  virtual void removeCellEditorListener(::javax::swing::event::CellEditorListener *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_CellEditor__
diff --git a/libjava/javax/swing/CellRendererPane$AccessibleCellRendererPane.h b/libjava/javax/swing/CellRendererPane$AccessibleCellRendererPane.h
new file mode 100644
index 000000000..da0650bcb
--- /dev/null
+++ b/libjava/javax/swing/CellRendererPane$AccessibleCellRendererPane.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_CellRendererPane$AccessibleCellRendererPane__
+#define __javax_swing_CellRendererPane$AccessibleCellRendererPane__
+
+#pragma interface
+
+#include <java/awt/Container$AccessibleAWTContainer.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleRole;
+    }
+    namespace swing
+    {
+        class CellRendererPane;
+        class CellRendererPane$AccessibleCellRendererPane;
+    }
+  }
+}
+
+class javax::swing::CellRendererPane$AccessibleCellRendererPane : public ::java::awt::Container$AccessibleAWTContainer
+{
+
+public: // actually protected
+  CellRendererPane$AccessibleCellRendererPane(::javax::swing::CellRendererPane *);
+public:
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+private:
+  static const jlong serialVersionUID = -8981090083147391074LL;
+public: // actually package-private
+  ::javax::swing::CellRendererPane * __attribute__((aligned(__alignof__( ::java::awt::Container$AccessibleAWTContainer)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_CellRendererPane$AccessibleCellRendererPane__
diff --git a/libjava/javax/swing/CellRendererPane.h b/libjava/javax/swing/CellRendererPane.h
new file mode 100644
index 000000000..af350004f
--- /dev/null
+++ b/libjava/javax/swing/CellRendererPane.h
@@ -0,0 +1,58 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_CellRendererPane__
+#define __javax_swing_CellRendererPane__
+
+#pragma interface
+
+#include <java/awt/Container.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Graphics;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class CellRendererPane;
+    }
+  }
+}
+
+class javax::swing::CellRendererPane : public ::java::awt::Container
+{
+
+public:
+  CellRendererPane();
+  virtual void update(::java::awt::Graphics *);
+  virtual void invalidate();
+  virtual void paint(::java::awt::Graphics *);
+public: // actually protected
+  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
+public:
+  virtual void paintComponent(::java::awt::Graphics *, ::java::awt::Component *, ::java::awt::Container *, jint, jint, jint, jint, jboolean);
+  virtual void paintComponent(::java::awt::Graphics *, ::java::awt::Component *, ::java::awt::Container *, jint, jint, jint, jint);
+  virtual void paintComponent(::java::awt::Graphics *, ::java::awt::Component *, ::java::awt::Container *, ::java::awt::Rectangle *);
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+private:
+  static const jlong serialVersionUID = -7642183829532984273LL;
+public: // actually protected
+  ::javax::accessibility::AccessibleContext * __attribute__((aligned(__alignof__( ::java::awt::Container)))) accessibleContext;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_CellRendererPane__
diff --git a/libjava/javax/swing/ComboBoxEditor.h b/libjava/javax/swing/ComboBoxEditor.h
new file mode 100644
index 000000000..14f0d4574
--- /dev/null
+++ b/libjava/javax/swing/ComboBoxEditor.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_ComboBoxEditor__
+#define __javax_swing_ComboBoxEditor__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+      namespace event
+      {
+          class ActionListener;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ComboBoxEditor;
+    }
+  }
+}
+
+class javax::swing::ComboBoxEditor : public ::java::lang::Object
+{
+
+public:
+  virtual ::java::awt::Component * getEditorComponent() = 0;
+  virtual void setItem(::java::lang::Object *) = 0;
+  virtual ::java::lang::Object * getItem() = 0;
+  virtual void selectAll() = 0;
+  virtual void addActionListener(::java::awt::event::ActionListener *) = 0;
+  virtual void removeActionListener(::java::awt::event::ActionListener *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_ComboBoxEditor__
diff --git a/libjava/javax/swing/ComboBoxModel.h b/libjava/javax/swing/ComboBoxModel.h
new file mode 100644
index 000000000..0fd38ea13
--- /dev/null
+++ b/libjava/javax/swing/ComboBoxModel.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_ComboBoxModel__
+#define __javax_swing_ComboBoxModel__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class ComboBoxModel;
+      namespace event
+      {
+          class ListDataListener;
+      }
+    }
+  }
+}
+
+class javax::swing::ComboBoxModel : public ::java::lang::Object
+{
+
+public:
+  virtual void setSelectedItem(::java::lang::Object *) = 0;
+  virtual ::java::lang::Object * getSelectedItem() = 0;
+  virtual jint getSize() = 0;
+  virtual ::java::lang::Object * getElementAt(jint) = 0;
+  virtual void addListDataListener(::javax::swing::event::ListDataListener *) = 0;
+  virtual void removeListDataListener(::javax::swing::event::ListDataListener *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_ComboBoxModel__
diff --git a/libjava/javax/swing/CompatibilityFocusTraversalPolicy.h b/libjava/javax/swing/CompatibilityFocusTraversalPolicy.h
new file mode 100644
index 000000000..46fcc8051
--- /dev/null
+++ b/libjava/javax/swing/CompatibilityFocusTraversalPolicy.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_CompatibilityFocusTraversalPolicy__
+#define __javax_swing_CompatibilityFocusTraversalPolicy__
+
+#pragma interface
+
+#include <java/awt/FocusTraversalPolicy.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class FocusTraversalPolicy;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class CompatibilityFocusTraversalPolicy;
+    }
+  }
+}
+
+class javax::swing::CompatibilityFocusTraversalPolicy : public ::java::awt::FocusTraversalPolicy
+{
+
+public: // actually package-private
+  CompatibilityFocusTraversalPolicy(::java::awt::FocusTraversalPolicy *);
+public:
+  virtual ::java::awt::Component * getComponentAfter(::java::awt::Container *, ::java::awt::Component *);
+  virtual ::java::awt::Component * getComponentBefore(::java::awt::Container *, ::java::awt::Component *);
+  virtual ::java::awt::Component * getFirstComponent(::java::awt::Container *);
+  virtual ::java::awt::Component * getLastComponent(::java::awt::Container *);
+  virtual ::java::awt::Component * getDefaultComponent(::java::awt::Container *);
+public: // actually package-private
+  virtual void setNextFocusableComponent(::java::awt::Component *, ::java::awt::Component *);
+  virtual void addNextFocusableComponent(::java::awt::Component *, ::java::awt::Component *);
+  virtual void removeNextFocusableComponent(::java::awt::Component *, ::java::awt::Component *);
+private:
+  ::java::awt::FocusTraversalPolicy * __attribute__((aligned(__alignof__( ::java::awt::FocusTraversalPolicy)))) fallback;
+  ::java::util::HashMap * forward;
+  ::java::util::HashMap * backward;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_CompatibilityFocusTraversalPolicy__
diff --git a/libjava/javax/swing/ComponentInputMap.h b/libjava/javax/swing/ComponentInputMap.h
new file mode 100644
index 000000000..e0ec4e946
--- /dev/null
+++ b/libjava/javax/swing/ComponentInputMap.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_ComponentInputMap__
+#define __javax_swing_ComponentInputMap__
+
+#pragma interface
+
+#include <javax/swing/InputMap.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class ComponentInputMap;
+        class InputMap;
+        class JComponent;
+        class KeyStroke;
+    }
+  }
+}
+
+class javax::swing::ComponentInputMap : public ::javax::swing::InputMap
+{
+
+public:
+  ComponentInputMap(::javax::swing::JComponent *);
+  virtual void put(::javax::swing::KeyStroke *, ::java::lang::Object *);
+  virtual void clear();
+  virtual void remove(::javax::swing::KeyStroke *);
+  virtual void setParent(::javax::swing::InputMap *);
+  virtual ::javax::swing::JComponent * getComponent();
+private:
+  ::javax::swing::JComponent * __attribute__((aligned(__alignof__( ::javax::swing::InputMap)))) component;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_ComponentInputMap__
diff --git a/libjava/javax/swing/DebugGraphics.h b/libjava/javax/swing/DebugGraphics.h
new file mode 100644
index 000000000..c21460f6d
--- /dev/null
+++ b/libjava/javax/swing/DebugGraphics.h
@@ -0,0 +1,132 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_DebugGraphics__
+#define __javax_swing_DebugGraphics__
+
+#pragma interface
+
+#include <java/awt/Graphics.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Font;
+        class FontMetrics;
+        class Graphics;
+        class Image;
+        class Rectangle;
+        class Shape;
+      namespace image
+      {
+          class ImageObserver;
+      }
+    }
+    namespace text
+    {
+        class AttributedCharacterIterator;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class DebugGraphics;
+        class JComponent;
+    }
+  }
+}
+
+class javax::swing::DebugGraphics : public ::java::awt::Graphics
+{
+
+public:
+  DebugGraphics();
+  DebugGraphics(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  DebugGraphics(::java::awt::Graphics *);
+  virtual void setColor(::java::awt::Color *);
+  virtual ::java::awt::Graphics * create();
+  virtual ::java::awt::Graphics * create(jint, jint, jint, jint);
+  static ::java::awt::Color * flashColor();
+  static void setFlashColor(::java::awt::Color *);
+  static jint flashTime();
+  static void setFlashTime(jint);
+  static jint flashCount();
+  static void setFlashCount(jint);
+  static ::java::io::PrintStream * logStream();
+  static void setLogStream(::java::io::PrintStream *);
+  virtual ::java::awt::Font * getFont();
+  virtual void setFont(::java::awt::Font *);
+  virtual ::java::awt::Color * getColor();
+  virtual ::java::awt::FontMetrics * getFontMetrics();
+  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
+  virtual void translate(jint, jint);
+  virtual void setPaintMode();
+  virtual void setXORMode(::java::awt::Color *);
+  virtual ::java::awt::Rectangle * getClipBounds();
+  virtual void clipRect(jint, jint, jint, jint);
+  virtual void setClip(jint, jint, jint, jint);
+  virtual ::java::awt::Shape * getClip();
+  virtual void setClip(::java::awt::Shape *);
+private:
+  void sleep(jint);
+public:
+  virtual void drawRect(jint, jint, jint, jint);
+  virtual void fillRect(jint, jint, jint, jint);
+  virtual void clearRect(jint, jint, jint, jint);
+  virtual void drawRoundRect(jint, jint, jint, jint, jint, jint);
+  virtual void fillRoundRect(jint, jint, jint, jint, jint, jint);
+  virtual void drawLine(jint, jint, jint, jint);
+  virtual void draw3DRect(jint, jint, jint, jint, jboolean);
+  virtual void fill3DRect(jint, jint, jint, jint, jboolean);
+  virtual void drawOval(jint, jint, jint, jint);
+  virtual void fillOval(jint, jint, jint, jint);
+  virtual void drawArc(jint, jint, jint, jint, jint, jint);
+  virtual void fillArc(jint, jint, jint, jint, jint, jint);
+  virtual void drawPolyline(JArray< jint > *, JArray< jint > *, jint);
+  virtual void drawPolygon(JArray< jint > *, JArray< jint > *, jint);
+  virtual void fillPolygon(JArray< jint > *, JArray< jint > *, jint);
+  virtual void drawString(::java::lang::String *, jint, jint);
+  virtual void drawString(::java::text::AttributedCharacterIterator *, jint, jint);
+  virtual void drawBytes(JArray< jbyte > *, jint, jint, jint, jint);
+  virtual void drawChars(JArray< jchar > *, jint, jint, jint, jint);
+  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
+  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::image::ImageObserver *);
+  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
+  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
+  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::image::ImageObserver *);
+  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *);
+  virtual void copyArea(jint, jint, jint, jint, jint, jint);
+  virtual void dispose();
+  virtual jboolean isDrawingBuffer();
+  virtual void setDebugOptions(jint);
+  virtual jint getDebugOptions();
+private:
+  ::java::lang::String * prefix();
+public:
+  static const jint LOG_OPTION = 1;
+  static const jint FLASH_OPTION = 2;
+  static const jint BUFFERED_OPTION = 4;
+  static const jint NONE_OPTION = -1;
+public: // actually package-private
+  static ::java::awt::Color * debugFlashColor;
+  static jint debugFlashCount;
+  static jint debugFlashTime;
+  static ::java::io::PrintStream * debugLogStream;
+  static jint counter;
+  ::java::awt::Graphics * __attribute__((aligned(__alignof__( ::java::awt::Graphics)))) graphics;
+  ::java::awt::Image * buffer;
+  jint debugOptions;
+  jint graphicsID;
+  jint xOffset;
+  jint yOffset;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_DebugGraphics__
diff --git a/libjava/javax/swing/DefaultBoundedRangeModel.h b/libjava/javax/swing/DefaultBoundedRangeModel.h
new file mode 100644
index 000000000..61d780d7a
--- /dev/null
+++ b/libjava/javax/swing/DefaultBoundedRangeModel.h
@@ -0,0 +1,71 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_DefaultBoundedRangeModel__
+#define __javax_swing_DefaultBoundedRangeModel__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class DefaultBoundedRangeModel;
+      namespace event
+      {
+          class ChangeEvent;
+          class ChangeListener;
+          class EventListenerList;
+      }
+    }
+  }
+}
+
+class javax::swing::DefaultBoundedRangeModel : public ::java::lang::Object
+{
+
+public:
+  DefaultBoundedRangeModel();
+  DefaultBoundedRangeModel(jint, jint, jint, jint);
+  virtual ::java::lang::String * toString();
+  virtual jint getValue();
+  virtual void setValue(jint);
+  virtual jint getExtent();
+  virtual void setExtent(jint);
+  virtual jint getMinimum();
+  virtual void setMinimum(jint);
+  virtual jint getMaximum();
+  virtual void setMaximum(jint);
+  virtual jboolean getValueIsAdjusting();
+  virtual void setValueIsAdjusting(jboolean);
+  virtual void setRangeProperties(jint, jint, jint, jint, jboolean);
+  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
+  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
+public: // actually protected
+  virtual void fireStateChanged();
+public:
+  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
+  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
+private:
+  void writeObject(::java::io::ObjectOutputStream *);
+  void readObject(::java::io::ObjectInputStream *);
+  static const jlong serialVersionUID = 5034068491295259790LL;
+public: // actually protected
+  ::javax::swing::event::ChangeEvent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) changeEvent;
+  ::javax::swing::event::EventListenerList * listenerList;
+private:
+  jint value;
+  jint extent;
+  jint minimum;
+  jint maximum;
+  jboolean isAdjusting;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_DefaultBoundedRangeModel__
diff --git a/libjava/javax/swing/DefaultButtonModel.h b/libjava/javax/swing/DefaultButtonModel.h
new file mode 100644
index 000000000..735898ddb
--- /dev/null
+++ b/libjava/javax/swing/DefaultButtonModel.h
@@ -0,0 +1,99 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_DefaultButtonModel__
+#define __javax_swing_DefaultButtonModel__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+          class ActionListener;
+          class ItemEvent;
+          class ItemListener;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ButtonGroup;
+        class DefaultButtonModel;
+      namespace event
+      {
+          class ChangeEvent;
+          class ChangeListener;
+          class EventListenerList;
+      }
+    }
+  }
+}
+
+class javax::swing::DefaultButtonModel : public ::java::lang::Object
+{
+
+public:
+  DefaultButtonModel();
+  virtual JArray< ::java::lang::Object * > * getSelectedObjects();
+  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
+  virtual void addActionListener(::java::awt::event::ActionListener *);
+  virtual void removeActionListener(::java::awt::event::ActionListener *);
+  virtual JArray< ::java::awt::event::ActionListener * > * getActionListeners();
+  virtual void addItemListener(::java::awt::event::ItemListener *);
+  virtual void removeItemListener(::java::awt::event::ItemListener *);
+  virtual JArray< ::java::awt::event::ItemListener * > * getItemListeners();
+  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
+  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
+  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
+public: // actually protected
+  virtual void fireItemStateChanged(::java::awt::event::ItemEvent *);
+  virtual void fireActionPerformed(::java::awt::event::ActionEvent *);
+  virtual void fireStateChanged();
+public:
+  virtual jboolean isArmed();
+  virtual void setArmed(jboolean);
+  virtual jboolean isEnabled();
+  virtual void setEnabled(jboolean);
+  virtual void setPressed(jboolean);
+  virtual jboolean isPressed();
+  virtual void setRollover(jboolean);
+  virtual void setSelected(jboolean);
+  virtual jboolean isSelected();
+  virtual jboolean isRollover();
+  virtual jint getMnemonic();
+  virtual void setMnemonic(jint);
+  virtual void setActionCommand(::java::lang::String *);
+  virtual ::java::lang::String * getActionCommand();
+  virtual void setGroup(::javax::swing::ButtonGroup *);
+  virtual ::javax::swing::ButtonGroup * getGroup();
+private:
+  static const jlong serialVersionUID = -5342609566534980231LL;
+public:
+  static const jint ARMED = 1;
+  static const jint ENABLED = 8;
+  static const jint PRESSED = 4;
+  static const jint ROLLOVER = 16;
+  static const jint SELECTED = 2;
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) stateMask;
+  ::javax::swing::event::EventListenerList * listenerList;
+  ::javax::swing::event::ChangeEvent * changeEvent;
+  ::javax::swing::ButtonGroup * group;
+  jint mnemonic;
+  ::java::lang::String * actionCommand;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_DefaultButtonModel__
diff --git a/libjava/javax/swing/DefaultCellEditor$EditorDelegate.h b/libjava/javax/swing/DefaultCellEditor$EditorDelegate.h
new file mode 100644
index 000000000..a571c5c5a
--- /dev/null
+++ b/libjava/javax/swing/DefaultCellEditor$EditorDelegate.h
@@ -0,0 +1,61 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_DefaultCellEditor$EditorDelegate__
+#define __javax_swing_DefaultCellEditor$EditorDelegate__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+          class ItemEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class DefaultCellEditor;
+        class DefaultCellEditor$EditorDelegate;
+    }
+  }
+}
+
+class javax::swing::DefaultCellEditor$EditorDelegate : public ::java::lang::Object
+{
+
+public: // actually protected
+  DefaultCellEditor$EditorDelegate(::javax::swing::DefaultCellEditor *);
+public:
+  virtual void setValue(::java::lang::Object *);
+  virtual ::java::lang::Object * getCellEditorValue();
+  virtual jboolean isCellEditable(::java::util::EventObject *);
+  virtual jboolean shouldSelectCell(::java::util::EventObject *);
+  virtual jboolean stopCellEditing();
+  virtual void cancelCellEditing();
+  virtual jboolean startCellEditing(::java::util::EventObject *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void itemStateChanged(::java::awt::event::ItemEvent *);
+public: // actually package-private
+  virtual void fireEditingStopped();
+  virtual void fireEditingCanceled();
+private:
+  static const jlong serialVersionUID = -1420007406015481933LL;
+public: // actually protected
+  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
+public: // actually package-private
+  ::javax::swing::DefaultCellEditor * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_DefaultCellEditor$EditorDelegate__
diff --git a/libjava/javax/swing/DefaultCellEditor$JCheckBoxDelegate.h b/libjava/javax/swing/DefaultCellEditor$JCheckBoxDelegate.h
new file mode 100644
index 000000000..08ecd3d59
--- /dev/null
+++ b/libjava/javax/swing/DefaultCellEditor$JCheckBoxDelegate.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_DefaultCellEditor$JCheckBoxDelegate__
+#define __javax_swing_DefaultCellEditor$JCheckBoxDelegate__
+
+#pragma interface
+
+#include <javax/swing/DefaultCellEditor$EditorDelegate.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class DefaultCellEditor;
+        class DefaultCellEditor$JCheckBoxDelegate;
+    }
+  }
+}
+
+class javax::swing::DefaultCellEditor$JCheckBoxDelegate : public ::javax::swing::DefaultCellEditor$EditorDelegate
+{
+
+  DefaultCellEditor$JCheckBoxDelegate(::javax::swing::DefaultCellEditor *);
+public:
+  virtual void setValue(::java::lang::Object *);
+  virtual ::java::lang::Object * getCellEditorValue();
+public: // actually package-private
+  DefaultCellEditor$JCheckBoxDelegate(::javax::swing::DefaultCellEditor *, ::javax::swing::DefaultCellEditor$JCheckBoxDelegate *);
+private:
+  static const jlong serialVersionUID = 1LL;
+public: // actually package-private
+  ::javax::swing::DefaultCellEditor * __attribute__((aligned(__alignof__( ::javax::swing::DefaultCellEditor$EditorDelegate)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_DefaultCellEditor$JCheckBoxDelegate__
diff --git a/libjava/javax/swing/DefaultCellEditor$JComboBoxDelegate.h b/libjava/javax/swing/DefaultCellEditor$JComboBoxDelegate.h
new file mode 100644
index 000000000..abfa15cc7
--- /dev/null
+++ b/libjava/javax/swing/DefaultCellEditor$JComboBoxDelegate.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_DefaultCellEditor$JComboBoxDelegate__
+#define __javax_swing_DefaultCellEditor$JComboBoxDelegate__
+
+#pragma interface
+
+#include <javax/swing/DefaultCellEditor$EditorDelegate.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class DefaultCellEditor;
+        class DefaultCellEditor$JComboBoxDelegate;
+    }
+  }
+}
+
+class javax::swing::DefaultCellEditor$JComboBoxDelegate : public ::javax::swing::DefaultCellEditor$EditorDelegate
+{
+
+  DefaultCellEditor$JComboBoxDelegate(::javax::swing::DefaultCellEditor *);
+public:
+  virtual void setValue(::java::lang::Object *);
+  virtual ::java::lang::Object * getCellEditorValue();
+  virtual jboolean shouldSelectCell(::java::util::EventObject *);
+public: // actually package-private
+  DefaultCellEditor$JComboBoxDelegate(::javax::swing::DefaultCellEditor *, ::javax::swing::DefaultCellEditor$JComboBoxDelegate *);
+private:
+  static const jlong serialVersionUID = 1LL;
+public: // actually package-private
+  ::javax::swing::DefaultCellEditor * __attribute__((aligned(__alignof__( ::javax::swing::DefaultCellEditor$EditorDelegate)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_DefaultCellEditor$JComboBoxDelegate__
diff --git a/libjava/javax/swing/DefaultCellEditor$JTextFieldDelegate.h b/libjava/javax/swing/DefaultCellEditor$JTextFieldDelegate.h
new file mode 100644
index 000000000..dcaf8f178
--- /dev/null
+++ b/libjava/javax/swing/DefaultCellEditor$JTextFieldDelegate.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_DefaultCellEditor$JTextFieldDelegate__
+#define __javax_swing_DefaultCellEditor$JTextFieldDelegate__
+
+#pragma interface
+
+#include <javax/swing/DefaultCellEditor$EditorDelegate.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class DefaultCellEditor;
+        class DefaultCellEditor$JTextFieldDelegate;
+    }
+  }
+}
+
+class javax::swing::DefaultCellEditor$JTextFieldDelegate : public ::javax::swing::DefaultCellEditor$EditorDelegate
+{
+
+  DefaultCellEditor$JTextFieldDelegate(::javax::swing::DefaultCellEditor *);
+public:
+  virtual void setValue(::java::lang::Object *);
+  virtual ::java::lang::Object * getCellEditorValue();
+public: // actually package-private
+  DefaultCellEditor$JTextFieldDelegate(::javax::swing::DefaultCellEditor *, ::javax::swing::DefaultCellEditor$JTextFieldDelegate *);
+private:
+  static const jlong serialVersionUID = 1LL;
+public: // actually package-private
+  ::javax::swing::DefaultCellEditor * __attribute__((aligned(__alignof__( ::javax::swing::DefaultCellEditor$EditorDelegate)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_DefaultCellEditor$JTextFieldDelegate__
diff --git a/libjava/javax/swing/DefaultCellEditor.h b/libjava/javax/swing/DefaultCellEditor.h
new file mode 100644
index 000000000..0c62413be
--- /dev/null
+++ b/libjava/javax/swing/DefaultCellEditor.h
@@ -0,0 +1,62 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_DefaultCellEditor__
+#define __javax_swing_DefaultCellEditor__
+
+#pragma interface
+
+#include <javax/swing/AbstractCellEditor.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class DefaultCellEditor;
+        class DefaultCellEditor$EditorDelegate;
+        class JCheckBox;
+        class JComboBox;
+        class JComponent;
+        class JTable;
+        class JTextField;
+        class JTree;
+    }
+  }
+}
+
+class javax::swing::DefaultCellEditor : public ::javax::swing::AbstractCellEditor
+{
+
+public:
+  DefaultCellEditor(::javax::swing::JTextField *);
+  DefaultCellEditor(::javax::swing::JCheckBox *);
+  DefaultCellEditor(::javax::swing::JComboBox *);
+  virtual ::java::awt::Component * getComponent();
+  virtual jint getClickCountToStart();
+  virtual void setClickCountToStart(jint);
+  virtual ::java::lang::Object * getCellEditorValue();
+  virtual jboolean isCellEditable(::java::util::EventObject *);
+  virtual jboolean shouldSelectCell(::java::util::EventObject *);
+  virtual jboolean stopCellEditing();
+  virtual void cancelCellEditing();
+  virtual ::java::awt::Component * getTreeCellEditorComponent(::javax::swing::JTree *, ::java::lang::Object *, jboolean, jboolean, jboolean, jint);
+  virtual ::java::awt::Component * getTableCellEditorComponent(::javax::swing::JTable *, ::java::lang::Object *, jboolean, jint, jint);
+private:
+  static const jlong serialVersionUID = 3564035141373880027LL;
+public: // actually protected
+  ::javax::swing::JComponent * __attribute__((aligned(__alignof__( ::javax::swing::AbstractCellEditor)))) editorComponent;
+  ::javax::swing::DefaultCellEditor$EditorDelegate * delegate;
+  jint clickCountToStart;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_DefaultCellEditor__
diff --git a/libjava/javax/swing/DefaultComboBoxModel.h b/libjava/javax/swing/DefaultComboBoxModel.h
new file mode 100644
index 000000000..9c5e721f7
--- /dev/null
+++ b/libjava/javax/swing/DefaultComboBoxModel.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_DefaultComboBoxModel__
+#define __javax_swing_DefaultComboBoxModel__
+
+#pragma interface
+
+#include <javax/swing/AbstractListModel.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class DefaultComboBoxModel;
+    }
+  }
+}
+
+class javax::swing::DefaultComboBoxModel : public ::javax::swing::AbstractListModel
+{
+
+public:
+  DefaultComboBoxModel();
+  DefaultComboBoxModel(JArray< ::java::lang::Object * > *);
+  DefaultComboBoxModel(::java::util::Vector *);
+  virtual void addElement(::java::lang::Object *);
+  virtual void removeElementAt(jint);
+  virtual void insertElementAt(::java::lang::Object *, jint);
+  virtual void removeElement(::java::lang::Object *);
+  virtual void removeAllElements();
+  virtual jint getSize();
+  virtual void setSelectedItem(::java::lang::Object *);
+  virtual ::java::lang::Object * getSelectedItem();
+  virtual ::java::lang::Object * getElementAt(jint);
+  virtual jint getIndexOf(::java::lang::Object *);
+private:
+  static const jlong serialVersionUID = 6698657703676921904LL;
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::AbstractListModel)))) list;
+  ::java::lang::Object * selectedItem;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_DefaultComboBoxModel__
diff --git a/libjava/javax/swing/DefaultDesktopManager.h b/libjava/javax/swing/DefaultDesktopManager.h
new file mode 100644
index 000000000..2857f0dfb
--- /dev/null
+++ b/libjava/javax/swing/DefaultDesktopManager.h
@@ -0,0 +1,73 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_DefaultDesktopManager__
+#define __javax_swing_DefaultDesktopManager__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Container;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class DefaultDesktopManager;
+        class JComponent;
+        class JInternalFrame;
+    }
+  }
+}
+
+class javax::swing::DefaultDesktopManager : public ::java::lang::Object
+{
+
+public:
+  DefaultDesktopManager();
+  virtual void openFrame(::javax::swing::JInternalFrame *);
+  virtual void closeFrame(::javax::swing::JInternalFrame *);
+  virtual void maximizeFrame(::javax::swing::JInternalFrame *);
+  virtual void minimizeFrame(::javax::swing::JInternalFrame *);
+  virtual void iconifyFrame(::javax::swing::JInternalFrame *);
+  virtual void deiconifyFrame(::javax::swing::JInternalFrame *);
+  virtual void activateFrame(::javax::swing::JInternalFrame *);
+  virtual void deactivateFrame(::javax::swing::JInternalFrame *);
+  virtual void beginDraggingFrame(::javax::swing::JComponent *);
+  virtual void dragFrame(::javax::swing::JComponent *, jint, jint);
+  virtual void endDraggingFrame(::javax::swing::JComponent *);
+  virtual void beginResizingFrame(::javax::swing::JComponent *, jint);
+  virtual void resizeFrame(::javax::swing::JComponent *, jint, jint, jint, jint);
+  virtual void endResizingFrame(::javax::swing::JComponent *);
+  virtual void setBoundsForFrame(::javax::swing::JComponent *, jint, jint, jint, jint);
+public: // actually protected
+  virtual void removeIconFor(::javax::swing::JInternalFrame *);
+  virtual ::java::awt::Rectangle * getBoundsForIconOf(::javax::swing::JInternalFrame *);
+  virtual void setPreviousBounds(::javax::swing::JInternalFrame *, ::java::awt::Rectangle *);
+  virtual ::java::awt::Rectangle * getPreviousBounds(::javax::swing::JInternalFrame *);
+  virtual void setWasIcon(::javax::swing::JInternalFrame *, ::java::lang::Boolean *);
+  virtual jboolean wasIcon(::javax::swing::JInternalFrame *);
+private:
+  static const jlong serialVersionUID = 4657624909838017887LL;
+public: // actually package-private
+  static ::java::lang::String * WAS_ICON_ONCE_PROPERTY;
+private:
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) currentDragMode;
+  ::java::awt::Rectangle * dragCache;
+  ::java::awt::Container * pane;
+  JArray< ::java::awt::Rectangle * > * iconRects;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_DefaultDesktopManager__
diff --git a/libjava/javax/swing/DefaultFocusManager.h b/libjava/javax/swing/DefaultFocusManager.h
new file mode 100644
index 000000000..a1eec270a
--- /dev/null
+++ b/libjava/javax/swing/DefaultFocusManager.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_DefaultFocusManager__
+#define __javax_swing_DefaultFocusManager__
+
+#pragma interface
+
+#include <javax/swing/FocusManager.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+      namespace event
+      {
+          class KeyEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class DefaultFocusManager;
+    }
+  }
+}
+
+class javax::swing::DefaultFocusManager : public ::javax::swing::FocusManager
+{
+
+public:
+  DefaultFocusManager();
+  virtual void processKeyEvent(::java::awt::Component *, ::java::awt::event::KeyEvent *);
+  virtual void focusNextComponent(::java::awt::Component *);
+  virtual void focusPreviousComponent(::java::awt::Component *);
+  virtual ::java::awt::Component * getFirstComponent(::java::awt::Container *);
+  virtual ::java::awt::Component * getLastComponent(::java::awt::Container *);
+  virtual ::java::awt::Component * getComponentBefore(::java::awt::Container *, ::java::awt::Component *);
+  virtual ::java::awt::Component * getComponentAfter(::java::awt::Container *, ::java::awt::Component *);
+  virtual jboolean compareTabOrder(::java::awt::Component *, ::java::awt::Component *);
+private:
+  ::java::util::Stack * __attribute__((aligned(__alignof__( ::javax::swing::FocusManager)))) historyStack;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_DefaultFocusManager__
diff --git a/libjava/javax/swing/DefaultListCellRenderer$UIResource.h b/libjava/javax/swing/DefaultListCellRenderer$UIResource.h
new file mode 100644
index 000000000..91435fb16
--- /dev/null
+++ b/libjava/javax/swing/DefaultListCellRenderer$UIResource.h
@@ -0,0 +1,29 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_DefaultListCellRenderer$UIResource__
+#define __javax_swing_DefaultListCellRenderer$UIResource__
+
+#pragma interface
+
+#include <javax/swing/DefaultListCellRenderer.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class DefaultListCellRenderer$UIResource;
+    }
+  }
+}
+
+class javax::swing::DefaultListCellRenderer$UIResource : public ::javax::swing::DefaultListCellRenderer
+{
+
+public:
+  DefaultListCellRenderer$UIResource();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_DefaultListCellRenderer$UIResource__
diff --git a/libjava/javax/swing/DefaultListCellRenderer.h b/libjava/javax/swing/DefaultListCellRenderer.h
new file mode 100644
index 000000000..320767aa5
--- /dev/null
+++ b/libjava/javax/swing/DefaultListCellRenderer.h
@@ -0,0 +1,63 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_DefaultListCellRenderer__
+#define __javax_swing_DefaultListCellRenderer__
+
+#pragma interface
+
+#include <javax/swing/JLabel.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class DefaultListCellRenderer;
+        class JList;
+      namespace border
+      {
+          class Border;
+      }
+    }
+  }
+}
+
+class javax::swing::DefaultListCellRenderer : public ::javax::swing::JLabel
+{
+
+public:
+  DefaultListCellRenderer();
+  virtual ::java::awt::Component * getListCellRendererComponent(::javax::swing::JList *, ::java::lang::Object *, jint, jboolean, jboolean);
+  virtual void validate();
+  virtual void revalidate();
+  virtual void repaint(jlong, jint, jint, jint, jint);
+  virtual void repaint(::java::awt::Rectangle *);
+public: // actually protected
+  virtual void firePropertyChange(::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *);
+public:
+  virtual void firePropertyChange(::java::lang::String *, jbyte, jbyte);
+  virtual void firePropertyChange(::java::lang::String *, jchar, jchar);
+  virtual void firePropertyChange(::java::lang::String *, jshort, jshort);
+  virtual void firePropertyChange(::java::lang::String *, jint, jint);
+  virtual void firePropertyChange(::java::lang::String *, jlong, jlong);
+  virtual void firePropertyChange(::java::lang::String *, jfloat, jfloat);
+  virtual void firePropertyChange(::java::lang::String *, jdouble, jdouble);
+  virtual void firePropertyChange(::java::lang::String *, jboolean, jboolean);
+private:
+  static const jlong serialVersionUID = 7708947179685189462LL;
+public: // actually protected
+  static ::javax::swing::border::Border * noFocusBorder;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_DefaultListCellRenderer__
diff --git a/libjava/javax/swing/DefaultListModel.h b/libjava/javax/swing/DefaultListModel.h
new file mode 100644
index 000000000..67ca91bdc
--- /dev/null
+++ b/libjava/javax/swing/DefaultListModel.h
@@ -0,0 +1,67 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_DefaultListModel__
+#define __javax_swing_DefaultListModel__
+
+#pragma interface
+
+#include <javax/swing/AbstractListModel.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class DefaultListModel;
+    }
+  }
+}
+
+class javax::swing::DefaultListModel : public ::javax::swing::AbstractListModel
+{
+
+public:
+  DefaultListModel();
+  virtual ::java::lang::Object * elementAt(jint);
+  virtual ::java::lang::String * toString();
+  virtual jint indexOf(::java::lang::Object *);
+  virtual jint indexOf(::java::lang::Object *, jint);
+  virtual jint lastIndexOf(::java::lang::Object *);
+  virtual jint lastIndexOf(::java::lang::Object *, jint);
+  virtual ::java::lang::Object * get(jint);
+  virtual ::java::lang::Object * set(jint, ::java::lang::Object *);
+  virtual void add(jint, ::java::lang::Object *);
+  virtual void addElement(::java::lang::Object *);
+  virtual jint size();
+  virtual JArray< ::java::lang::Object * > * toArray();
+  virtual jboolean contains(::java::lang::Object *);
+  virtual void copyInto(JArray< ::java::lang::Object * > *);
+  virtual void clear();
+  virtual ::java::lang::Object * remove(jint);
+  virtual jboolean isEmpty();
+  virtual ::java::util::Enumeration * elements();
+  virtual void trimToSize();
+  virtual void ensureCapacity(jint);
+  virtual void setSize(jint);
+  virtual jint capacity();
+  virtual ::java::lang::Object * firstElement();
+  virtual ::java::lang::Object * lastElement();
+  virtual void setElementAt(::java::lang::Object *, jint);
+  virtual void removeElementAt(jint);
+  virtual void insertElementAt(::java::lang::Object *, jint);
+  virtual jboolean removeElement(::java::lang::Object *);
+  virtual void removeAllElements();
+  virtual void removeRange(jint, jint);
+  virtual jint getSize();
+  virtual ::java::lang::Object * getElementAt(jint);
+private:
+  static const jlong serialVersionUID = 2315945659722172272LL;
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::AbstractListModel)))) elements__;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_DefaultListModel__
diff --git a/libjava/javax/swing/DefaultListSelectionModel.h b/libjava/javax/swing/DefaultListSelectionModel.h
new file mode 100644
index 000000000..0a0ed22a3
--- /dev/null
+++ b/libjava/javax/swing/DefaultListSelectionModel.h
@@ -0,0 +1,86 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_DefaultListSelectionModel__
+#define __javax_swing_DefaultListSelectionModel__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class DefaultListSelectionModel;
+      namespace event
+      {
+          class EventListenerList;
+          class ListSelectionListener;
+      }
+    }
+  }
+}
+
+class javax::swing::DefaultListSelectionModel : public ::java::lang::Object
+{
+
+public:
+  DefaultListSelectionModel();
+  virtual jint getSelectionMode();
+  virtual void setSelectionMode(jint);
+  virtual jint getAnchorSelectionIndex();
+  virtual void setAnchorSelectionIndex(jint);
+  virtual jint getLeadSelectionIndex();
+  virtual void setLeadSelectionIndex(jint);
+  virtual void moveLeadSelectionIndex(jint);
+  virtual jboolean isLeadAnchorNotificationEnabled();
+  virtual void setLeadAnchorNotificationEnabled(jboolean);
+  virtual jboolean getValueIsAdjusting();
+  virtual void setValueIsAdjusting(jboolean);
+  virtual jboolean isSelectionEmpty();
+  virtual jint getMinSelectionIndex();
+  virtual jint getMaxSelectionIndex();
+  virtual jboolean isSelectedIndex(jint);
+  virtual void addSelectionInterval(jint, jint);
+  virtual void removeSelectionInterval(jint, jint);
+  virtual void clearSelection();
+private:
+  void fireDifference(::java::util::BitSet *, ::java::util::BitSet *);
+public:
+  virtual void setSelectionInterval(jint, jint);
+  virtual void insertIndexInterval(jint, jint, jboolean);
+  virtual void removeIndexInterval(jint, jint);
+public: // actually protected
+  virtual void fireValueChanged(jboolean);
+  virtual void fireValueChanged(jint, jint);
+  virtual void fireValueChanged(jint, jint, jboolean);
+public:
+  virtual void addListSelectionListener(::javax::swing::event::ListSelectionListener *);
+  virtual void removeListSelectionListener(::javax::swing::event::ListSelectionListener *);
+  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
+  virtual JArray< ::javax::swing::event::ListSelectionListener * > * getListSelectionListeners();
+  virtual ::java::lang::Object * clone();
+private:
+  static const jlong serialVersionUID = -5718799865110415860LL;
+public: // actually protected
+  ::javax::swing::event::EventListenerList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) listenerList;
+public: // actually package-private
+  jint selectionMode;
+  jint leadSelectionIndex;
+  jint anchorSelectionIndex;
+public: // actually protected
+  jboolean leadAnchorNotificationEnabled;
+public: // actually package-private
+  jboolean valueIsAdjusting;
+  ::java::util::BitSet * sel;
+  ::java::lang::Object * oldSel;
+  jboolean setLeadCalledFromAdd;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_DefaultListSelectionModel__
diff --git a/libjava/javax/swing/DefaultSingleSelectionModel.h b/libjava/javax/swing/DefaultSingleSelectionModel.h
new file mode 100644
index 000000000..8ea8f8e79
--- /dev/null
+++ b/libjava/javax/swing/DefaultSingleSelectionModel.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_DefaultSingleSelectionModel__
+#define __javax_swing_DefaultSingleSelectionModel__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class DefaultSingleSelectionModel;
+      namespace event
+      {
+          class ChangeEvent;
+          class ChangeListener;
+          class EventListenerList;
+      }
+    }
+  }
+}
+
+class javax::swing::DefaultSingleSelectionModel : public ::java::lang::Object
+{
+
+public:
+  DefaultSingleSelectionModel();
+  virtual jint getSelectedIndex();
+  virtual void setSelectedIndex(jint);
+  virtual void clearSelection();
+  virtual jboolean isSelected();
+  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
+  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
+public: // actually protected
+  virtual void fireStateChanged();
+public:
+  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
+  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
+private:
+  static const jlong serialVersionUID = 3676229404753786004LL;
+public: // actually protected
+  ::javax::swing::event::ChangeEvent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) changeEvent;
+  ::javax::swing::event::EventListenerList * listenerList;
+private:
+  jint index;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_DefaultSingleSelectionModel__
diff --git a/libjava/javax/swing/DesktopManager.h b/libjava/javax/swing/DesktopManager.h
new file mode 100644
index 000000000..7981bdbb5
--- /dev/null
+++ b/libjava/javax/swing/DesktopManager.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_DesktopManager__
+#define __javax_swing_DesktopManager__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class DesktopManager;
+        class JComponent;
+        class JInternalFrame;
+    }
+  }
+}
+
+class javax::swing::DesktopManager : public ::java::lang::Object
+{
+
+public:
+  virtual void openFrame(::javax::swing::JInternalFrame *) = 0;
+  virtual void closeFrame(::javax::swing::JInternalFrame *) = 0;
+  virtual void maximizeFrame(::javax::swing::JInternalFrame *) = 0;
+  virtual void minimizeFrame(::javax::swing::JInternalFrame *) = 0;
+  virtual void iconifyFrame(::javax::swing::JInternalFrame *) = 0;
+  virtual void deiconifyFrame(::javax::swing::JInternalFrame *) = 0;
+  virtual void activateFrame(::javax::swing::JInternalFrame *) = 0;
+  virtual void deactivateFrame(::javax::swing::JInternalFrame *) = 0;
+  virtual void beginDraggingFrame(::javax::swing::JComponent *) = 0;
+  virtual void dragFrame(::javax::swing::JComponent *, jint, jint) = 0;
+  virtual void endDraggingFrame(::javax::swing::JComponent *) = 0;
+  virtual void beginResizingFrame(::javax::swing::JComponent *, jint) = 0;
+  virtual void resizeFrame(::javax::swing::JComponent *, jint, jint, jint, jint) = 0;
+  virtual void endResizingFrame(::javax::swing::JComponent *) = 0;
+  virtual void setBoundsForFrame(::javax::swing::JComponent *, jint, jint, jint, jint) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_DesktopManager__
diff --git a/libjava/javax/swing/FocusManager$WrappingFocusManager.h b/libjava/javax/swing/FocusManager$WrappingFocusManager.h
new file mode 100644
index 000000000..6ff193c53
--- /dev/null
+++ b/libjava/javax/swing/FocusManager$WrappingFocusManager.h
@@ -0,0 +1,93 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_FocusManager$WrappingFocusManager__
+#define __javax_swing_FocusManager$WrappingFocusManager__
+
+#pragma interface
+
+#include <javax/swing/FocusManager.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class AWTEvent;
+        class Component;
+        class Container;
+        class FocusTraversalPolicy;
+        class KeyEventDispatcher;
+        class KeyEventPostProcessor;
+        class KeyboardFocusManager;
+        class Window;
+      namespace event
+      {
+          class KeyEvent;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+        class VetoableChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class FocusManager$WrappingFocusManager;
+    }
+  }
+}
+
+class javax::swing::FocusManager$WrappingFocusManager : public ::javax::swing::FocusManager
+{
+
+public: // actually package-private
+  FocusManager$WrappingFocusManager(::java::awt::KeyboardFocusManager *);
+public:
+  virtual jboolean dispatchEvent(::java::awt::AWTEvent *);
+  virtual jboolean dispatchKeyEvent(::java::awt::event::KeyEvent *);
+  virtual void downFocusCycle(::java::awt::Container *);
+  virtual void upFocusCycle(::java::awt::Container *);
+  virtual void focusNextComponent(::java::awt::Component *);
+  virtual void focusPreviousComponent(::java::awt::Component *);
+  virtual jboolean postProcessKeyEvent(::java::awt::event::KeyEvent *);
+  virtual void processKeyEvent(::java::awt::Component *, ::java::awt::event::KeyEvent *);
+  virtual void addKeyEventDispatcher(::java::awt::KeyEventDispatcher *);
+  virtual void addKeyEventPostProcessor(::java::awt::KeyEventPostProcessor *);
+  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
+  virtual void addPropertyChangeListener(::java::lang::String *, ::java::beans::PropertyChangeListener *);
+  virtual void addVetoableChangeListener(::java::lang::String *, ::java::beans::VetoableChangeListener *);
+  virtual void addVetoableChangeListener(::java::beans::VetoableChangeListener *);
+  virtual void clearGlobalFocusOwner();
+  virtual ::java::awt::Window * getActiveWindow();
+  virtual ::java::awt::Container * getCurrentFocusCycleRoot();
+  virtual ::java::util::Set * getDefaultFocusTraversalKeys(jint);
+  virtual ::java::awt::FocusTraversalPolicy * getDefaultFocusTraversalPolicy();
+  virtual ::java::awt::Window * getFocusedWindow();
+  virtual ::java::awt::Component * getFocusOwner();
+  virtual ::java::awt::Component * getPermanentFocusOwner();
+  virtual JArray< ::java::beans::PropertyChangeListener * > * getPropertyChangeListeners();
+  virtual JArray< ::java::beans::PropertyChangeListener * > * getPropertyChangeListeners(::java::lang::String *);
+  virtual JArray< ::java::beans::VetoableChangeListener * > * getVetoableChangeListeners();
+  virtual JArray< ::java::beans::VetoableChangeListener * > * getVetoableChangeListeners(::java::lang::String *);
+  virtual void removeKeyEventDispatcher(::java::awt::KeyEventDispatcher *);
+  virtual void removeKeyEventPostProcessor(::java::awt::KeyEventPostProcessor *);
+  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
+  virtual void removePropertyChangeListener(::java::lang::String *, ::java::beans::PropertyChangeListener *);
+  virtual void removeVetoableChangeListener(::java::beans::VetoableChangeListener *);
+  virtual void removeVetoableChangeListener(::java::lang::String *, ::java::beans::VetoableChangeListener *);
+  virtual void setDefaultFocusTraversalKeys(jint, ::java::util::Set *);
+  virtual void setDefaultFocusTraversalPolicy(::java::awt::FocusTraversalPolicy *);
+  virtual void setGlobalCurrentFocusCycleRoot(::java::awt::Container *);
+private:
+  ::java::awt::KeyboardFocusManager * __attribute__((aligned(__alignof__( ::javax::swing::FocusManager)))) wrapped;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_FocusManager$WrappingFocusManager__
diff --git a/libjava/javax/swing/FocusManager.h b/libjava/javax/swing/FocusManager.h
new file mode 100644
index 000000000..0bf939438
--- /dev/null
+++ b/libjava/javax/swing/FocusManager.h
@@ -0,0 +1,34 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_FocusManager__
+#define __javax_swing_FocusManager__
+
+#pragma interface
+
+#include <java/awt/DefaultKeyboardFocusManager.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class FocusManager;
+    }
+  }
+}
+
+class javax::swing::FocusManager : public ::java::awt::DefaultKeyboardFocusManager
+{
+
+public:
+  FocusManager();
+  static ::javax::swing::FocusManager * getCurrentManager();
+  static void setCurrentManager(::javax::swing::FocusManager *);
+  static void disableSwingFocusManager();
+  static jboolean isFocusManagerEnabled();
+  static ::java::lang::String * FOCUS_MANAGER_CLASS_PROPERTY;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_FocusManager__
diff --git a/libjava/javax/swing/GrayFilter.h b/libjava/javax/swing/GrayFilter.h
new file mode 100644
index 000000000..436c3763a
--- /dev/null
+++ b/libjava/javax/swing/GrayFilter.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_GrayFilter__
+#define __javax_swing_GrayFilter__
+
+#pragma interface
+
+#include <java/awt/image/RGBImageFilter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Image;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class GrayFilter;
+    }
+  }
+}
+
+class javax::swing::GrayFilter : public ::java::awt::image::RGBImageFilter
+{
+
+public:
+  GrayFilter(jboolean, jint);
+  static ::java::awt::Image * createDisabledImage(::java::awt::Image *);
+  virtual jint filterRGB(jint, jint, jint);
+private:
+  jboolean __attribute__((aligned(__alignof__( ::java::awt::image::RGBImageFilter)))) b;
+  jdouble p;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_GrayFilter__
diff --git a/libjava/javax/swing/Icon.h b/libjava/javax/swing/Icon.h
new file mode 100644
index 000000000..7ab6cfe4d
--- /dev/null
+++ b/libjava/javax/swing/Icon.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_Icon__
+#define __javax_swing_Icon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+    }
+  }
+}
+
+class javax::swing::Icon : public ::java::lang::Object
+{
+
+public:
+  virtual jint getIconHeight() = 0;
+  virtual jint getIconWidth() = 0;
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_Icon__
diff --git a/libjava/javax/swing/ImageIcon$1.h b/libjava/javax/swing/ImageIcon$1.h
new file mode 100644
index 000000000..529be408a
--- /dev/null
+++ b/libjava/javax/swing/ImageIcon$1.h
@@ -0,0 +1,30 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_ImageIcon$1__
+#define __javax_swing_ImageIcon$1__
+
+#pragma interface
+
+#include <java/awt/Component.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class ImageIcon$1;
+    }
+  }
+}
+
+class javax::swing::ImageIcon$1 : public ::java::awt::Component
+{
+
+public: // actually package-private
+  ImageIcon$1();
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_ImageIcon$1__
diff --git a/libjava/javax/swing/ImageIcon$AccessibleImageIcon.h b/libjava/javax/swing/ImageIcon$AccessibleImageIcon.h
new file mode 100644
index 000000000..05d2323e2
--- /dev/null
+++ b/libjava/javax/swing/ImageIcon$AccessibleImageIcon.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_ImageIcon$AccessibleImageIcon__
+#define __javax_swing_ImageIcon$AccessibleImageIcon__
+
+#pragma interface
+
+#include <javax/accessibility/AccessibleContext.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+        class AccessibleRole;
+        class AccessibleStateSet;
+    }
+    namespace swing
+    {
+        class ImageIcon;
+        class ImageIcon$AccessibleImageIcon;
+    }
+  }
+}
+
+class javax::swing::ImageIcon$AccessibleImageIcon : public ::javax::accessibility::AccessibleContext
+{
+
+public: // actually protected
+  ImageIcon$AccessibleImageIcon(::javax::swing::ImageIcon *);
+public:
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
+  virtual ::javax::accessibility::Accessible * getAccessibleParent();
+  virtual jint getAccessibleIndexInParent();
+  virtual jint getAccessibleChildrenCount();
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
+  virtual ::java::util::Locale * getLocale();
+  virtual ::java::lang::String * getAccessibleIconDescription();
+  virtual void setAccessibleIconDescription(::java::lang::String *);
+  virtual jint getAccessibleIconHeight();
+  virtual jint getAccessibleIconWidth();
+private:
+  static const jlong serialVersionUID = 2113430526551336564LL;
+public: // actually package-private
+  ::javax::swing::ImageIcon * __attribute__((aligned(__alignof__( ::javax::accessibility::AccessibleContext)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_ImageIcon$AccessibleImageIcon__
diff --git a/libjava/javax/swing/ImageIcon.h b/libjava/javax/swing/ImageIcon.h
new file mode 100644
index 000000000..4e3d8d902
--- /dev/null
+++ b/libjava/javax/swing/ImageIcon.h
@@ -0,0 +1,90 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_ImageIcon__
+#define __javax_swing_ImageIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Image;
+        class MediaTracker;
+      namespace image
+      {
+          class ImageObserver;
+      }
+    }
+    namespace net
+    {
+        class URL;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class ImageIcon;
+    }
+  }
+}
+
+class javax::swing::ImageIcon : public ::java::lang::Object
+{
+
+public:
+  ImageIcon();
+  ImageIcon(::java::lang::String *);
+  ImageIcon(::java::lang::String *, ::java::lang::String *);
+  ImageIcon(JArray< jbyte > *);
+  ImageIcon(JArray< jbyte > *, ::java::lang::String *);
+  ImageIcon(::java::net::URL *);
+  ImageIcon(::java::net::URL *, ::java::lang::String *);
+  ImageIcon(::java::awt::Image *);
+  ImageIcon(::java::awt::Image *, ::java::lang::String *);
+  virtual ::java::awt::image::ImageObserver * getImageObserver();
+  virtual void setImageObserver(::java::awt::image::ImageObserver *);
+  virtual ::java::awt::Image * getImage();
+  virtual void setImage(::java::awt::Image *);
+  virtual ::java::lang::String * getDescription();
+  virtual void setDescription(::java::lang::String *);
+  virtual jint getIconHeight();
+  virtual jint getIconWidth();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+public: // actually protected
+  virtual void loadImage(::java::awt::Image *);
+public:
+  virtual jint getImageLoadStatus();
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+private:
+  static const jlong serialVersionUID = 532615968316031794LL;
+public: // actually protected
+  static ::java::awt::Component * component;
+  static ::java::awt::MediaTracker * tracker;
+private:
+  static jint id;
+public: // actually package-private
+  ::java::awt::Image * __attribute__((aligned(__alignof__( ::java::lang::Object)))) image;
+  ::java::lang::String * description;
+  ::java::awt::image::ImageObserver * observer;
+private:
+  jint loadStatus;
+  ::javax::accessibility::AccessibleContext * accessibleContext;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_ImageIcon__
diff --git a/libjava/javax/swing/InputMap.h b/libjava/javax/swing/InputMap.h
new file mode 100644
index 000000000..5846eeb25
--- /dev/null
+++ b/libjava/javax/swing/InputMap.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_InputMap__
+#define __javax_swing_InputMap__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class InputMap;
+        class KeyStroke;
+    }
+  }
+}
+
+class javax::swing::InputMap : public ::java::lang::Object
+{
+
+public:
+  InputMap();
+  virtual ::java::lang::Object * get(::javax::swing::KeyStroke *);
+  virtual void put(::javax::swing::KeyStroke *, ::java::lang::Object *);
+  virtual void remove(::javax::swing::KeyStroke *);
+  virtual ::javax::swing::InputMap * getParent();
+  virtual void setParent(::javax::swing::InputMap *);
+  virtual jint size();
+  virtual void clear();
+  virtual JArray< ::javax::swing::KeyStroke * > * keys();
+  virtual JArray< ::javax::swing::KeyStroke * > * allKeys();
+private:
+  static const jlong serialVersionUID = -5429059542008604257LL;
+  ::java::util::Map * __attribute__((aligned(__alignof__( ::java::lang::Object)))) inputMap;
+  ::javax::swing::InputMap * parent;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_InputMap__
diff --git a/libjava/javax/swing/InputVerifier.h b/libjava/javax/swing/InputVerifier.h
new file mode 100644
index 000000000..986647e1b
--- /dev/null
+++ b/libjava/javax/swing/InputVerifier.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_InputVerifier__
+#define __javax_swing_InputVerifier__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class InputVerifier;
+        class JComponent;
+    }
+  }
+}
+
+class javax::swing::InputVerifier : public ::java::lang::Object
+{
+
+public:
+  InputVerifier();
+  virtual jboolean verify(::javax::swing::JComponent *) = 0;
+  virtual jboolean shouldYieldFocus(::javax::swing::JComponent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_InputVerifier__
diff --git a/libjava/javax/swing/InternalFrameFocusTraversalPolicy.h b/libjava/javax/swing/InternalFrameFocusTraversalPolicy.h
new file mode 100644
index 000000000..4573093d4
--- /dev/null
+++ b/libjava/javax/swing/InternalFrameFocusTraversalPolicy.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_InternalFrameFocusTraversalPolicy__
+#define __javax_swing_InternalFrameFocusTraversalPolicy__
+
+#pragma interface
+
+#include <java/awt/FocusTraversalPolicy.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class InternalFrameFocusTraversalPolicy;
+        class JInternalFrame;
+    }
+  }
+}
+
+class javax::swing::InternalFrameFocusTraversalPolicy : public ::java::awt::FocusTraversalPolicy
+{
+
+public:
+  InternalFrameFocusTraversalPolicy();
+  virtual ::java::awt::Component * getInitialComponent(::javax::swing::JInternalFrame *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_InternalFrameFocusTraversalPolicy__
diff --git a/libjava/javax/swing/JApplet$AccessibleJApplet.h b/libjava/javax/swing/JApplet$AccessibleJApplet.h
new file mode 100644
index 000000000..d6aea498e
--- /dev/null
+++ b/libjava/javax/swing/JApplet$AccessibleJApplet.h
@@ -0,0 +1,33 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JApplet$AccessibleJApplet__
+#define __javax_swing_JApplet$AccessibleJApplet__
+
+#pragma interface
+
+#include <java/applet/Applet$AccessibleApplet.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JApplet;
+        class JApplet$AccessibleJApplet;
+    }
+  }
+}
+
+class javax::swing::JApplet$AccessibleJApplet : public ::java::applet::Applet$AccessibleApplet
+{
+
+public: // actually protected
+  JApplet$AccessibleJApplet(::javax::swing::JApplet *);
+public: // actually package-private
+  ::javax::swing::JApplet * __attribute__((aligned(__alignof__( ::java::applet::Applet$AccessibleApplet)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JApplet$AccessibleJApplet__
diff --git a/libjava/javax/swing/JApplet.h b/libjava/javax/swing/JApplet.h
new file mode 100644
index 000000000..16cdbcf69
--- /dev/null
+++ b/libjava/javax/swing/JApplet.h
@@ -0,0 +1,88 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JApplet__
+#define __javax_swing_JApplet__
+
+#pragma interface
+
+#include <java/applet/Applet.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+        class Graphics;
+        class LayoutManager;
+      namespace event
+      {
+          class KeyEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class JApplet;
+        class JLayeredPane;
+        class JMenuBar;
+        class JRootPane;
+    }
+  }
+}
+
+class javax::swing::JApplet : public ::java::applet::Applet
+{
+
+public:
+  JApplet();
+  virtual ::java::awt::Dimension * getPreferredSize();
+  virtual void setLayout(::java::awt::LayoutManager *);
+  virtual void setLayeredPane(::javax::swing::JLayeredPane *);
+  virtual ::javax::swing::JLayeredPane * getLayeredPane();
+  virtual ::javax::swing::JRootPane * getRootPane();
+public: // actually protected
+  virtual void setRootPane(::javax::swing::JRootPane *);
+  virtual ::javax::swing::JRootPane * createRootPane();
+public:
+  virtual ::java::awt::Container * getContentPane();
+  virtual void setContentPane(::java::awt::Container *);
+  virtual ::java::awt::Component * getGlassPane();
+  virtual void setGlassPane(::java::awt::Component *);
+public: // actually protected
+  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
+public:
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+  virtual ::javax::swing::JMenuBar * getJMenuBar();
+  virtual void setJMenuBar(::javax::swing::JMenuBar *);
+public: // actually protected
+  virtual ::java::lang::String * paramString();
+  virtual void processKeyEvent(::java::awt::event::KeyEvent *);
+public:
+  virtual void remove(::java::awt::Component *);
+public: // actually protected
+  virtual jboolean isRootPaneCheckingEnabled();
+  virtual void setRootPaneCheckingEnabled(jboolean);
+public:
+  virtual void update(::java::awt::Graphics *);
+public: // actually protected
+  ::javax::accessibility::AccessibleContext * __attribute__((aligned(__alignof__( ::java::applet::Applet)))) accessibleContext;
+private:
+  static const jlong serialVersionUID = 7269359214497372587LL;
+public: // actually protected
+  ::javax::swing::JRootPane * rootPane;
+  jboolean rootPaneCheckingEnabled;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JApplet__
diff --git a/libjava/javax/swing/JButton$AccessibleJButton.h b/libjava/javax/swing/JButton$AccessibleJButton.h
new file mode 100644
index 000000000..b8f0f3ed8
--- /dev/null
+++ b/libjava/javax/swing/JButton$AccessibleJButton.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JButton$AccessibleJButton__
+#define __javax_swing_JButton$AccessibleJButton__
+
+#pragma interface
+
+#include <javax/swing/AbstractButton$AccessibleAbstractButton.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleRole;
+    }
+    namespace swing
+    {
+        class JButton;
+        class JButton$AccessibleJButton;
+    }
+  }
+}
+
+class javax::swing::JButton$AccessibleJButton : public ::javax::swing::AbstractButton$AccessibleAbstractButton
+{
+
+public: // actually protected
+  JButton$AccessibleJButton(::javax::swing::JButton *);
+public:
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+public: // actually package-private
+  ::javax::swing::JButton * __attribute__((aligned(__alignof__( ::javax::swing::AbstractButton$AccessibleAbstractButton)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JButton$AccessibleJButton__
diff --git a/libjava/javax/swing/JButton.h b/libjava/javax/swing/JButton.h
new file mode 100644
index 000000000..a151bae8a
--- /dev/null
+++ b/libjava/javax/swing/JButton.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JButton__
+#define __javax_swing_JButton__
+
+#pragma interface
+
+#include <javax/swing/AbstractButton.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class Action;
+        class Icon;
+        class JButton;
+    }
+  }
+}
+
+class javax::swing::JButton : public ::javax::swing::AbstractButton
+{
+
+public:
+  JButton();
+  JButton(::javax::swing::Action *);
+  JButton(::javax::swing::Icon *);
+  JButton(::java::lang::String *);
+  JButton(::java::lang::String *, ::javax::swing::Icon *);
+public: // actually protected
+  virtual void configurePropertiesFromAction(::javax::swing::Action *);
+public:
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+  virtual ::java::lang::String * getUIClassID();
+  virtual jboolean isDefaultButton();
+  virtual jboolean isDefaultCapable();
+public: // actually protected
+  virtual ::java::lang::String * paramString();
+public:
+  virtual void removeNotify();
+  virtual void setDefaultCapable(jboolean);
+  virtual void updateUI();
+private:
+  static const jlong serialVersionUID = -1907255238954382202LL;
+  jboolean __attribute__((aligned(__alignof__( ::javax::swing::AbstractButton)))) defaultCapable;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JButton__
diff --git a/libjava/javax/swing/JCheckBox$AccessibleJCheckBox.h b/libjava/javax/swing/JCheckBox$AccessibleJCheckBox.h
new file mode 100644
index 000000000..34d711e39
--- /dev/null
+++ b/libjava/javax/swing/JCheckBox$AccessibleJCheckBox.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JCheckBox$AccessibleJCheckBox__
+#define __javax_swing_JCheckBox$AccessibleJCheckBox__
+
+#pragma interface
+
+#include <javax/swing/JToggleButton$AccessibleJToggleButton.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleRole;
+    }
+    namespace swing
+    {
+        class JCheckBox;
+        class JCheckBox$AccessibleJCheckBox;
+    }
+  }
+}
+
+class javax::swing::JCheckBox$AccessibleJCheckBox : public ::javax::swing::JToggleButton$AccessibleJToggleButton
+{
+
+public: // actually protected
+  JCheckBox$AccessibleJCheckBox(::javax::swing::JCheckBox *);
+public:
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+public: // actually package-private
+  ::javax::swing::JCheckBox * __attribute__((aligned(__alignof__( ::javax::swing::JToggleButton$AccessibleJToggleButton)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JCheckBox$AccessibleJCheckBox__
diff --git a/libjava/javax/swing/JCheckBox.h b/libjava/javax/swing/JCheckBox.h
new file mode 100644
index 000000000..b57d5c167
--- /dev/null
+++ b/libjava/javax/swing/JCheckBox.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JCheckBox__
+#define __javax_swing_JCheckBox__
+
+#pragma interface
+
+#include <javax/swing/JToggleButton.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class Action;
+        class Icon;
+        class JCheckBox;
+    }
+  }
+}
+
+class javax::swing::JCheckBox : public ::javax::swing::JToggleButton
+{
+
+  void init();
+public:
+  JCheckBox();
+  JCheckBox(::javax::swing::Action *);
+  JCheckBox(::javax::swing::Icon *);
+  JCheckBox(::javax::swing::Icon *, jboolean);
+  JCheckBox(::java::lang::String *);
+  JCheckBox(::java::lang::String *, jboolean);
+  JCheckBox(::java::lang::String *, ::javax::swing::Icon *);
+  JCheckBox(::java::lang::String *, ::javax::swing::Icon *, jboolean);
+  virtual ::java::lang::String * getUIClassID();
+public: // actually protected
+  virtual ::java::lang::String * paramString();
+public:
+  virtual jboolean isBorderPaintedFlat();
+  virtual void setBorderPaintedFlat(jboolean);
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+private:
+  static const jlong serialVersionUID = -5246739313864538930LL;
+public:
+  static ::java::lang::String * BORDER_PAINTED_FLAT_CHANGED_PROPERTY;
+private:
+  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JToggleButton)))) borderPaintedFlat;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JCheckBox__
diff --git a/libjava/javax/swing/JCheckBoxMenuItem$AccessibleJCheckBoxMenuItem.h b/libjava/javax/swing/JCheckBoxMenuItem$AccessibleJCheckBoxMenuItem.h
new file mode 100644
index 000000000..550897609
--- /dev/null
+++ b/libjava/javax/swing/JCheckBoxMenuItem$AccessibleJCheckBoxMenuItem.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JCheckBoxMenuItem$AccessibleJCheckBoxMenuItem__
+#define __javax_swing_JCheckBoxMenuItem$AccessibleJCheckBoxMenuItem__
+
+#pragma interface
+
+#include <javax/swing/JMenuItem$AccessibleJMenuItem.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleRole;
+    }
+    namespace swing
+    {
+        class JCheckBoxMenuItem;
+        class JCheckBoxMenuItem$AccessibleJCheckBoxMenuItem;
+    }
+  }
+}
+
+class javax::swing::JCheckBoxMenuItem$AccessibleJCheckBoxMenuItem : public ::javax::swing::JMenuItem$AccessibleJMenuItem
+{
+
+public: // actually protected
+  JCheckBoxMenuItem$AccessibleJCheckBoxMenuItem(::javax::swing::JCheckBoxMenuItem *);
+public:
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+private:
+  static const jlong serialVersionUID = 1079958073579370777LL;
+public: // actually package-private
+  ::javax::swing::JCheckBoxMenuItem * __attribute__((aligned(__alignof__( ::javax::swing::JMenuItem$AccessibleJMenuItem)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JCheckBoxMenuItem$AccessibleJCheckBoxMenuItem__
diff --git a/libjava/javax/swing/JCheckBoxMenuItem.h b/libjava/javax/swing/JCheckBoxMenuItem.h
new file mode 100644
index 000000000..fcb335522
--- /dev/null
+++ b/libjava/javax/swing/JCheckBoxMenuItem.h
@@ -0,0 +1,58 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JCheckBoxMenuItem__
+#define __javax_swing_JCheckBoxMenuItem__
+
+#pragma interface
+
+#include <javax/swing/JMenuItem.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class Action;
+        class Icon;
+        class JCheckBoxMenuItem;
+    }
+  }
+}
+
+class javax::swing::JCheckBoxMenuItem : public ::javax::swing::JMenuItem
+{
+
+public:
+  JCheckBoxMenuItem();
+  JCheckBoxMenuItem(::javax::swing::Icon *);
+  JCheckBoxMenuItem(::java::lang::String *);
+  JCheckBoxMenuItem(::javax::swing::Action *);
+  JCheckBoxMenuItem(::java::lang::String *, ::javax::swing::Icon *);
+  JCheckBoxMenuItem(::java::lang::String *, jboolean);
+  JCheckBoxMenuItem(::java::lang::String *, ::javax::swing::Icon *, jboolean);
+  virtual ::java::lang::String * getUIClassID();
+  virtual jboolean getState();
+  virtual void setState(jboolean);
+  virtual JArray< ::java::lang::Object * > * getSelectedObjects();
+  virtual void requestFocus();
+public: // actually protected
+  virtual ::java::lang::String * paramString();
+public:
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+private:
+  static const jlong serialVersionUID = -6676402307973384715LL;
+  static ::java::lang::String * uiClassID;
+  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JMenuItem)))) state;
+  JArray< ::java::lang::Object * > * selectedObjects;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JCheckBoxMenuItem__
diff --git a/libjava/javax/swing/JColorChooser$AccessibleJColorChooser.h b/libjava/javax/swing/JColorChooser$AccessibleJColorChooser.h
new file mode 100644
index 000000000..6a4ecf731
--- /dev/null
+++ b/libjava/javax/swing/JColorChooser$AccessibleJColorChooser.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JColorChooser$AccessibleJColorChooser__
+#define __javax_swing_JColorChooser$AccessibleJColorChooser__
+
+#pragma interface
+
+#include <javax/swing/JComponent$AccessibleJComponent.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleRole;
+    }
+    namespace swing
+    {
+        class JColorChooser;
+        class JColorChooser$AccessibleJColorChooser;
+    }
+  }
+}
+
+class javax::swing::JColorChooser$AccessibleJColorChooser : public ::javax::swing::JComponent$AccessibleJComponent
+{
+
+public: // actually protected
+  JColorChooser$AccessibleJColorChooser(::javax::swing::JColorChooser *);
+public:
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+private:
+  static const jlong serialVersionUID = -2038297864782299082LL;
+public: // actually package-private
+  ::javax::swing::JColorChooser * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JColorChooser$AccessibleJColorChooser__
diff --git a/libjava/javax/swing/JColorChooser$DefaultOKCancelListener.h b/libjava/javax/swing/JColorChooser$DefaultOKCancelListener.h
new file mode 100644
index 000000000..0b2093c2d
--- /dev/null
+++ b/libjava/javax/swing/JColorChooser$DefaultOKCancelListener.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JColorChooser$DefaultOKCancelListener__
+#define __javax_swing_JColorChooser$DefaultOKCancelListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JColorChooser$DefaultOKCancelListener;
+        class JDialog;
+    }
+  }
+}
+
+class javax::swing::JColorChooser$DefaultOKCancelListener : public ::java::lang::Object
+{
+
+public:
+  JColorChooser$DefaultOKCancelListener(::javax::swing::JDialog *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+private:
+  ::javax::swing::JDialog * __attribute__((aligned(__alignof__( ::java::lang::Object)))) dialog;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JColorChooser$DefaultOKCancelListener__
diff --git a/libjava/javax/swing/JColorChooser$DefaultResetListener.h b/libjava/javax/swing/JColorChooser$DefaultResetListener.h
new file mode 100644
index 000000000..4167cbbcf
--- /dev/null
+++ b/libjava/javax/swing/JColorChooser$DefaultResetListener.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JColorChooser$DefaultResetListener__
+#define __javax_swing_JColorChooser$DefaultResetListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JColorChooser;
+        class JColorChooser$DefaultResetListener;
+    }
+  }
+}
+
+class javax::swing::JColorChooser$DefaultResetListener : public ::java::lang::Object
+{
+
+public:
+  JColorChooser$DefaultResetListener(::javax::swing::JColorChooser *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+private:
+  ::javax::swing::JColorChooser * __attribute__((aligned(__alignof__( ::java::lang::Object)))) chooser;
+  ::java::awt::Color * init;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JColorChooser$DefaultResetListener__
diff --git a/libjava/javax/swing/JColorChooser.h b/libjava/javax/swing/JColorChooser.h
new file mode 100644
index 000000000..66d0da607
--- /dev/null
+++ b/libjava/javax/swing/JColorChooser.h
@@ -0,0 +1,102 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JColorChooser__
+#define __javax_swing_JColorChooser__
+
+#pragma interface
+
+#include <javax/swing/JComponent.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+      namespace event
+      {
+          class ActionListener;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class JColorChooser;
+        class JComponent;
+        class JDialog;
+      namespace colorchooser
+      {
+          class AbstractColorChooserPanel;
+          class ColorSelectionModel;
+      }
+      namespace plaf
+      {
+          class ColorChooserUI;
+      }
+    }
+  }
+}
+
+class javax::swing::JColorChooser : public ::javax::swing::JComponent
+{
+
+public:
+  JColorChooser();
+  JColorChooser(::java::awt::Color *);
+  JColorChooser(::javax::swing::colorchooser::ColorSelectionModel *);
+  virtual void setColor(::java::awt::Color *);
+  virtual void setColor(jint, jint, jint);
+  virtual void setColor(jint);
+  static ::java::awt::Color * showDialog(::java::awt::Component *, ::java::lang::String *, ::java::awt::Color *);
+public: // actually package-private
+  static void makeModal(::javax::swing::JDialog *);
+private:
+  static ::java::awt::Component * findParent(::java::awt::Component *);
+public:
+  static ::javax::swing::JDialog * createDialog(::java::awt::Component *, ::java::lang::String *, jboolean, ::javax::swing::JColorChooser *, ::java::awt::event::ActionListener *, ::java::awt::event::ActionListener *);
+  virtual ::javax::swing::plaf::ColorChooserUI * getUI();
+  virtual void setUI(::javax::swing::plaf::ColorChooserUI *);
+  virtual void updateUI();
+  virtual ::java::lang::String * getUIClassID();
+  virtual ::java::awt::Color * getColor();
+  virtual void setPreviewPanel(::javax::swing::JComponent *);
+  virtual ::javax::swing::JComponent * getPreviewPanel();
+  virtual void addChooserPanel(::javax::swing::colorchooser::AbstractColorChooserPanel *);
+  virtual ::javax::swing::colorchooser::AbstractColorChooserPanel * removeChooserPanel(::javax::swing::colorchooser::AbstractColorChooserPanel *);
+  virtual void setChooserPanels(JArray< ::javax::swing::colorchooser::AbstractColorChooserPanel * > *);
+  virtual JArray< ::javax::swing::colorchooser::AbstractColorChooserPanel * > * getChooserPanels();
+  virtual ::javax::swing::colorchooser::ColorSelectionModel * getSelectionModel();
+  virtual void setSelectionModel(::javax::swing::colorchooser::ColorSelectionModel *);
+  virtual jboolean getDragEnabled();
+  virtual void setDragEnabled(jboolean);
+public: // actually protected
+  virtual ::java::lang::String * paramString();
+public:
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+private:
+  static const jlong serialVersionUID = 9168066781620640889LL;
+  ::javax::swing::colorchooser::ColorSelectionModel * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) selectionModel;
+  ::javax::swing::JComponent * previewPanel;
+  JArray< ::javax::swing::colorchooser::AbstractColorChooserPanel * > * chooserPanels;
+  jboolean dragEnabled;
+public:
+  static ::java::lang::String * SELECTION_MODEL_PROPERTY;
+  static ::java::lang::String * PREVIEW_PANEL_PROPERTY;
+  static ::java::lang::String * CHOOSER_PANELS_PROPERTY;
+public: // actually protected
+  ::javax::accessibility::AccessibleContext * accessibleContext;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JColorChooser__
diff --git a/libjava/javax/swing/JComboBox$1.h b/libjava/javax/swing/JComboBox$1.h
new file mode 100644
index 000000000..46ba3ae1a
--- /dev/null
+++ b/libjava/javax/swing/JComboBox$1.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JComboBox$1__
+#define __javax_swing_JComboBox$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComboBox;
+        class JComboBox$1;
+    }
+  }
+}
+
+class javax::swing::JComboBox$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  JComboBox$1(::javax::swing::JComboBox *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::JComboBox * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JComboBox$1__
diff --git a/libjava/javax/swing/JComboBox$AccessibleJComboBox.h b/libjava/javax/swing/JComboBox$AccessibleJComboBox.h
new file mode 100644
index 000000000..7f8b2ca99
--- /dev/null
+++ b/libjava/javax/swing/JComboBox$AccessibleJComboBox.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JComboBox$AccessibleJComboBox__
+#define __javax_swing_JComboBox$AccessibleJComboBox__
+
+#pragma interface
+
+#include <javax/swing/JComponent$AccessibleJComponent.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+        class AccessibleAction;
+        class AccessibleRole;
+        class AccessibleSelection;
+    }
+    namespace swing
+    {
+        class JComboBox;
+        class JComboBox$AccessibleJComboBox;
+    }
+  }
+}
+
+class javax::swing::JComboBox$AccessibleJComboBox : public ::javax::swing::JComponent$AccessibleJComponent
+{
+
+public:
+  JComboBox$AccessibleJComboBox(::javax::swing::JComboBox *);
+  virtual jint getAccessibleChildrenCount();
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
+  virtual ::javax::accessibility::AccessibleSelection * getAccessibleSelection();
+  virtual ::javax::accessibility::Accessible * getAccessibleSelection(jint);
+  virtual jboolean isAccessibleChildSelected(jint);
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+  virtual ::javax::accessibility::AccessibleAction * getAccessibleAction();
+  virtual ::java::lang::String * getAccessibleActionDescription(jint);
+  virtual jint getAccessibleActionCount();
+  virtual jboolean doAccessibleAction(jint);
+  virtual jint getAccessibleSelectionCount();
+  virtual void addAccessibleSelection(jint);
+  virtual void removeAccessibleSelection(jint);
+  virtual void clearAccessibleSelection();
+  virtual void selectAllAccessibleSelection();
+private:
+  static const jlong serialVersionUID = 8217828307256675666LL;
+public: // actually package-private
+  ::javax::swing::JComboBox * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JComboBox$AccessibleJComboBox__
diff --git a/libjava/javax/swing/JComboBox$DefaultKeySelectionManager.h b/libjava/javax/swing/JComboBox$DefaultKeySelectionManager.h
new file mode 100644
index 000000000..d968118ed
--- /dev/null
+++ b/libjava/javax/swing/JComboBox$DefaultKeySelectionManager.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JComboBox$DefaultKeySelectionManager__
+#define __javax_swing_JComboBox$DefaultKeySelectionManager__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class ComboBoxModel;
+        class JComboBox;
+        class JComboBox$DefaultKeySelectionManager;
+    }
+  }
+}
+
+class javax::swing::JComboBox$DefaultKeySelectionManager : public ::java::lang::Object
+{
+
+  JComboBox$DefaultKeySelectionManager(::javax::swing::JComboBox *);
+public:
+  virtual jint selectionForKey(jchar, ::javax::swing::ComboBoxModel *);
+public: // actually package-private
+  JComboBox$DefaultKeySelectionManager(::javax::swing::JComboBox *, ::javax::swing::JComboBox$DefaultKeySelectionManager *);
+  ::javax::swing::JComboBox * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JComboBox$DefaultKeySelectionManager__
diff --git a/libjava/javax/swing/JComboBox$KeySelectionManager.h b/libjava/javax/swing/JComboBox$KeySelectionManager.h
new file mode 100644
index 000000000..4d6314e8f
--- /dev/null
+++ b/libjava/javax/swing/JComboBox$KeySelectionManager.h
@@ -0,0 +1,30 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JComboBox$KeySelectionManager__
+#define __javax_swing_JComboBox$KeySelectionManager__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class ComboBoxModel;
+        class JComboBox$KeySelectionManager;
+    }
+  }
+}
+
+class javax::swing::JComboBox$KeySelectionManager : public ::java::lang::Object
+{
+
+public:
+  virtual jint selectionForKey(jchar, ::javax::swing::ComboBoxModel *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_JComboBox$KeySelectionManager__
diff --git a/libjava/javax/swing/JComboBox.h b/libjava/javax/swing/JComboBox.h
new file mode 100644
index 000000000..ef9f7147c
--- /dev/null
+++ b/libjava/javax/swing/JComboBox.h
@@ -0,0 +1,164 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JComboBox__
+#define __javax_swing_JComboBox__
+
+#pragma interface
+
+#include <javax/swing/JComponent.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+          class ActionListener;
+          class ItemEvent;
+          class ItemListener;
+          class KeyEvent;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class Action;
+        class ComboBoxEditor;
+        class ComboBoxModel;
+        class JComboBox;
+        class JComboBox$KeySelectionManager;
+        class ListCellRenderer;
+      namespace event
+      {
+          class ListDataEvent;
+          class PopupMenuListener;
+      }
+      namespace plaf
+      {
+          class ComboBoxUI;
+      }
+    }
+  }
+}
+
+class javax::swing::JComboBox : public ::javax::swing::JComponent
+{
+
+public:
+  JComboBox(::javax::swing::ComboBoxModel *);
+  JComboBox(JArray< ::java::lang::Object * > *);
+  JComboBox(::java::util::Vector *);
+  JComboBox();
+  virtual jboolean isEditable();
+public: // actually protected
+  virtual void installAncestorListener();
+public:
+  virtual void setUI(::javax::swing::plaf::ComboBoxUI *);
+  virtual void updateUI();
+  virtual ::java::lang::String * getUIClassID();
+  virtual ::javax::swing::plaf::ComboBoxUI * getUI();
+  virtual void setModel(::javax::swing::ComboBoxModel *);
+  virtual ::javax::swing::ComboBoxModel * getModel();
+  virtual void setLightWeightPopupEnabled(jboolean);
+  virtual jboolean isLightWeightPopupEnabled();
+  virtual void setEditable(jboolean);
+  virtual void setMaximumRowCount(jint);
+  virtual jint getMaximumRowCount();
+  virtual void setRenderer(::javax::swing::ListCellRenderer *);
+  virtual ::javax::swing::ListCellRenderer * getRenderer();
+  virtual void setEditor(::javax::swing::ComboBoxEditor *);
+  virtual ::javax::swing::ComboBoxEditor * getEditor();
+  virtual void setSelectedItem(::java::lang::Object *);
+  virtual ::java::lang::Object * getSelectedItem();
+  virtual void setSelectedIndex(jint);
+  virtual jint getSelectedIndex();
+  virtual ::java::lang::Object * getPrototypeDisplayValue();
+  virtual void setPrototypeDisplayValue(::java::lang::Object *);
+  virtual void addItem(::java::lang::Object *);
+  virtual void insertItemAt(::java::lang::Object *, jint);
+  virtual void removeItem(::java::lang::Object *);
+  virtual void removeItemAt(jint);
+  virtual void removeAllItems();
+  virtual void showPopup();
+  virtual void hidePopup();
+  virtual void setPopupVisible(jboolean);
+  virtual jboolean isPopupVisible();
+  virtual void setActionCommand(::java::lang::String *);
+  virtual ::java::lang::String * getActionCommand();
+  virtual void setAction(::javax::swing::Action *);
+  virtual ::javax::swing::Action * getAction();
+public: // actually protected
+  virtual void configurePropertiesFromAction(::javax::swing::Action *);
+  virtual ::java::beans::PropertyChangeListener * createActionPropertyChangeListener(::javax::swing::Action *);
+  virtual void fireItemStateChanged(::java::awt::event::ItemEvent *);
+  virtual void fireActionEvent();
+public:
+  virtual void firePopupMenuCanceled();
+  virtual void firePopupMenuWillBecomeInvisible();
+  virtual void firePopupMenuWillBecomeVisible();
+public: // actually protected
+  virtual void selectedItemChanged();
+public:
+  virtual JArray< ::java::lang::Object * > * getSelectedObjects();
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual jboolean selectWithKeyChar(jchar);
+  virtual void intervalAdded(::javax::swing::event::ListDataEvent *);
+  virtual void intervalRemoved(::javax::swing::event::ListDataEvent *);
+  virtual void contentsChanged(::javax::swing::event::ListDataEvent *);
+  virtual void setEnabled(jboolean);
+  virtual void configureEditor(::javax::swing::ComboBoxEditor *, ::java::lang::Object *);
+  virtual void processKeyEvent(::java::awt::event::KeyEvent *);
+  virtual void setKeySelectionManager(::javax::swing::JComboBox$KeySelectionManager *);
+  virtual ::javax::swing::JComboBox$KeySelectionManager * getKeySelectionManager();
+  virtual jint getItemCount();
+  virtual ::java::lang::Object * getItemAt(jint);
+public: // actually protected
+  virtual ::javax::swing::JComboBox$KeySelectionManager * createDefaultKeySelectionManager();
+  virtual ::java::lang::String * paramString();
+public:
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+  virtual void addActionListener(::java::awt::event::ActionListener *);
+  virtual void removeActionListener(::java::awt::event::ActionListener *);
+  virtual JArray< ::java::awt::event::ActionListener * > * getActionListeners();
+  virtual void addItemListener(::java::awt::event::ItemListener *);
+  virtual void removeItemListener(::java::awt::event::ItemListener *);
+  virtual JArray< ::java::awt::event::ItemListener * > * getItemListeners();
+  virtual void addPopupMenuListener(::javax::swing::event::PopupMenuListener *);
+  virtual void removePopupMenuListener(::javax::swing::event::PopupMenuListener *);
+  virtual JArray< ::javax::swing::event::PopupMenuListener * > * getPopupMenuListeners();
+private:
+  static const jlong serialVersionUID = 5654585963292734470LL;
+  static const jint DEFAULT_MAXIMUM_ROW_COUNT = 8;
+public: // actually protected
+  ::javax::swing::ComboBoxModel * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) dataModel;
+  ::javax::swing::ListCellRenderer * renderer;
+  ::javax::swing::ComboBoxEditor * editor;
+  jint maximumRowCount;
+  jboolean isEditable__;
+  ::java::lang::Object * selectedItemReminder;
+  ::javax::swing::JComboBox$KeySelectionManager * keySelectionManager;
+  ::java::lang::String * actionCommand;
+  jboolean lightWeightPopupEnabled;
+private:
+  ::javax::swing::Action * action;
+  ::java::lang::Object * prototypeDisplayValue;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JComboBox__
diff --git a/libjava/javax/swing/JComponent$1.h b/libjava/javax/swing/JComponent$1.h
new file mode 100644
index 000000000..22584337a
--- /dev/null
+++ b/libjava/javax/swing/JComponent$1.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JComponent$1__
+#define __javax_swing_JComponent$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class JComponent$1;
+    }
+  }
+}
+
+class javax::swing::JComponent$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  JComponent$1(::javax::swing::JComponent *);
+public:
+  virtual void run();
+public: // actually package-private
+  ::javax::swing::JComponent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JComponent$1__
diff --git a/libjava/javax/swing/JComponent$AccessibleJComponent$AccessibleContainerHandler.h b/libjava/javax/swing/JComponent$AccessibleJComponent$AccessibleContainerHandler.h
new file mode 100644
index 000000000..6b25d9aea
--- /dev/null
+++ b/libjava/javax/swing/JComponent$AccessibleJComponent$AccessibleContainerHandler.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JComponent$AccessibleJComponent$AccessibleContainerHandler__
+#define __javax_swing_JComponent$AccessibleJComponent$AccessibleContainerHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ContainerEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent$AccessibleJComponent;
+        class JComponent$AccessibleJComponent$AccessibleContainerHandler;
+    }
+  }
+}
+
+class javax::swing::JComponent$AccessibleJComponent$AccessibleContainerHandler : public ::java::lang::Object
+{
+
+public: // actually protected
+  JComponent$AccessibleJComponent$AccessibleContainerHandler(::javax::swing::JComponent$AccessibleJComponent *);
+public:
+  virtual void componentAdded(::java::awt::event::ContainerEvent *);
+  virtual void componentRemoved(::java::awt::event::ContainerEvent *);
+public: // actually package-private
+  ::javax::swing::JComponent$AccessibleJComponent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JComponent$AccessibleJComponent$AccessibleContainerHandler__
diff --git a/libjava/javax/swing/JComponent$AccessibleJComponent$AccessibleFocusHandler.h b/libjava/javax/swing/JComponent$AccessibleJComponent$AccessibleFocusHandler.h
new file mode 100644
index 000000000..508254168
--- /dev/null
+++ b/libjava/javax/swing/JComponent$AccessibleJComponent$AccessibleFocusHandler.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JComponent$AccessibleJComponent$AccessibleFocusHandler__
+#define __javax_swing_JComponent$AccessibleJComponent$AccessibleFocusHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class FocusEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent$AccessibleJComponent;
+        class JComponent$AccessibleJComponent$AccessibleFocusHandler;
+    }
+  }
+}
+
+class javax::swing::JComponent$AccessibleJComponent$AccessibleFocusHandler : public ::java::lang::Object
+{
+
+public: // actually protected
+  JComponent$AccessibleJComponent$AccessibleFocusHandler(::javax::swing::JComponent$AccessibleJComponent *);
+public:
+  virtual void focusGained(::java::awt::event::FocusEvent *);
+  virtual void focusLost(::java::awt::event::FocusEvent *);
+public: // actually package-private
+  ::javax::swing::JComponent$AccessibleJComponent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JComponent$AccessibleJComponent$AccessibleFocusHandler__
diff --git a/libjava/javax/swing/JComponent$AccessibleJComponent.h b/libjava/javax/swing/JComponent$AccessibleJComponent.h
new file mode 100644
index 000000000..d0a354674
--- /dev/null
+++ b/libjava/javax/swing/JComponent$AccessibleJComponent.h
@@ -0,0 +1,79 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JComponent$AccessibleJComponent__
+#define __javax_swing_JComponent$AccessibleJComponent__
+
+#pragma interface
+
+#include <java/awt/Container$AccessibleAWTContainer.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ContainerListener;
+          class FocusListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+        class AccessibleKeyBinding;
+        class AccessibleRole;
+        class AccessibleStateSet;
+    }
+    namespace swing
+    {
+        class JComponent;
+        class JComponent$AccessibleJComponent;
+      namespace border
+      {
+          class Border;
+      }
+    }
+  }
+}
+
+class javax::swing::JComponent$AccessibleJComponent : public ::java::awt::Container$AccessibleAWTContainer
+{
+
+public: // actually protected
+  JComponent$AccessibleJComponent(::javax::swing::JComponent *);
+public:
+  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
+  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
+  virtual jint getAccessibleChildrenCount();
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
+  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
+  virtual ::java::lang::String * getAccessibleName();
+  virtual ::java::lang::String * getAccessibleDescription();
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+public: // actually protected
+  virtual ::java::lang::String * getBorderTitle(::javax::swing::border::Border *);
+public:
+  virtual ::java::lang::String * getToolTipText();
+  virtual ::java::lang::String * getTitledBorderText();
+  virtual ::javax::accessibility::AccessibleKeyBinding * getAccessibleKeyBinding();
+private:
+  static const jlong serialVersionUID = -7047089700479897799LL;
+public: // actually protected
+  ::java::awt::event::ContainerListener * __attribute__((aligned(__alignof__( ::java::awt::Container$AccessibleAWTContainer)))) accessibleContainerHandler;
+  ::java::awt::event::FocusListener * accessibleFocusHandler;
+public: // actually package-private
+  ::javax::swing::JComponent * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JComponent$AccessibleJComponent__
diff --git a/libjava/javax/swing/JComponent$ActionListenerProxy.h b/libjava/javax/swing/JComponent$ActionListenerProxy.h
new file mode 100644
index 000000000..9679e1909
--- /dev/null
+++ b/libjava/javax/swing/JComponent$ActionListenerProxy.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JComponent$ActionListenerProxy__
+#define __javax_swing_JComponent$ActionListenerProxy__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+          class ActionListener;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent$ActionListenerProxy;
+    }
+  }
+}
+
+class javax::swing::JComponent$ActionListenerProxy : public ::javax::swing::AbstractAction
+{
+
+public:
+  JComponent$ActionListenerProxy(::java::awt::event::ActionListener *, ::java::lang::String *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::java::awt::event::ActionListener * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) target;
+  ::java::lang::String * bindingCommandName;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JComponent$ActionListenerProxy__
diff --git a/libjava/javax/swing/JComponent.h b/libjava/javax/swing/JComponent.h
new file mode 100644
index 000000000..a27b20509
--- /dev/null
+++ b/libjava/javax/swing/JComponent.h
@@ -0,0 +1,296 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JComponent__
+#define __javax_swing_JComponent__
+
+#pragma interface
+
+#include <java/awt/Container.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Container;
+        class Dimension;
+        class Font;
+        class Graphics;
+        class Image;
+        class Insets;
+        class Point;
+        class Rectangle;
+      namespace event
+      {
+          class ActionListener;
+          class KeyEvent;
+          class MouseEvent;
+      }
+    }
+    namespace beans
+    {
+        class VetoableChangeListener;
+        class VetoableChangeSupport;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class ActionMap;
+        class ComponentInputMap;
+        class InputMap;
+        class InputVerifier;
+        class JComponent;
+        class JPopupMenu;
+        class JRootPane;
+        class JToolTip;
+        class KeyStroke;
+        class TransferHandler;
+      namespace border
+      {
+          class Border;
+      }
+      namespace event
+      {
+          class AncestorListener;
+          class EventListenerList;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+      }
+    }
+  }
+}
+
+class javax::swing::JComponent : public ::java::awt::Container
+{
+
+public:
+  JComponent();
+private:
+  ::java::util::Hashtable * getClientProperties();
+public:
+  virtual ::java::lang::Object * getClientProperty(::java::lang::Object *);
+  virtual void putClientProperty(::java::lang::Object *, ::java::lang::Object *);
+  virtual void removeAncestorListener(::javax::swing::event::AncestorListener *);
+  virtual void removeVetoableChangeListener(::java::beans::VetoableChangeListener *);
+  virtual void addAncestorListener(::javax::swing::event::AncestorListener *);
+  virtual void addVetoableChangeListener(::java::beans::VetoableChangeListener *);
+  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
+  virtual JArray< ::javax::swing::event::AncestorListener * > * getAncestorListeners();
+  virtual JArray< ::java::beans::VetoableChangeListener * > * getVetoableChangeListeners();
+public: // actually protected
+  virtual void fireVetoableChange(::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *);
+public:
+  virtual void firePropertyChange(::java::lang::String *, jint, jint);
+  virtual void firePropertyChange(::java::lang::String *, jboolean, jboolean);
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+  virtual jfloat getAlignmentX();
+  virtual jfloat getAlignmentY();
+  virtual jboolean getAutoscrolls();
+  virtual void setBorder(::javax::swing::border::Border *);
+  virtual ::javax::swing::border::Border * getBorder();
+  virtual ::java::awt::Rectangle * getBounds(::java::awt::Rectangle *);
+public: // actually protected
+  virtual ::java::awt::Graphics * getComponentGraphics(::java::awt::Graphics *);
+public:
+  virtual jint getDebugGraphicsOptions();
+  virtual ::java::awt::Insets * getInsets();
+  virtual ::java::awt::Insets * getInsets(::java::awt::Insets *);
+  virtual ::java::awt::Point * getLocation(::java::awt::Point *);
+  virtual ::java::awt::Dimension * getMaximumSize();
+  virtual ::java::awt::Dimension * getMinimumSize();
+  virtual ::java::awt::Dimension * getPreferredSize();
+  virtual ::java::awt::Component * getNextFocusableComponent();
+  virtual JArray< ::javax::swing::KeyStroke * > * getRegisteredKeyStrokes();
+  virtual ::javax::swing::JRootPane * getRootPane();
+  virtual ::java::awt::Dimension * getSize(::java::awt::Dimension *);
+  virtual ::javax::swing::JToolTip * createToolTip();
+  virtual ::java::awt::Point * getToolTipLocation(::java::awt::event::MouseEvent *);
+  virtual void setToolTipText(::java::lang::String *);
+  virtual ::java::lang::String * getToolTipText();
+  virtual ::java::lang::String * getToolTipText(::java::awt::event::MouseEvent *);
+  virtual jboolean getInheritsPopupMenu();
+  virtual void setInheritsPopupMenu(jboolean);
+  virtual ::javax::swing::JPopupMenu * getComponentPopupMenu();
+  virtual void setComponentPopupMenu(::javax::swing::JPopupMenu *);
+  virtual ::java::awt::Container * getTopLevelAncestor();
+  virtual void computeVisibleRect(::java::awt::Rectangle *);
+  virtual ::java::awt::Rectangle * getVisibleRect();
+  virtual void grabFocus();
+  virtual jboolean isDoubleBuffered();
+  static jboolean isLightweightComponent(::java::awt::Component *);
+  virtual jboolean isManagingFocus();
+  virtual jboolean isOpaque();
+  virtual jboolean isOptimizedDrawingEnabled();
+  virtual jboolean isPaintingTile();
+  virtual jboolean isRequestFocusEnabled();
+  virtual jboolean isValidateRoot();
+  virtual void paint(::java::awt::Graphics *);
+private:
+  jboolean isOccupiedByChild(jint, jint, jint, jint);
+  void initializeDragBuffer();
+public: // actually protected
+  virtual void paintBorder(::java::awt::Graphics *);
+  virtual void paintChildren(::java::awt::Graphics *);
+private:
+  jboolean isCompletelyObscured(jint, jint, jint, jint, jint);
+  jboolean isPartiallyObscured(jint, jint, jint, jint, jint);
+public: // actually protected
+  virtual void paintComponent(::java::awt::Graphics *);
+public:
+  virtual void paintImmediately(jint, jint, jint, jint);
+  virtual void paintImmediately(::java::awt::Rectangle *);
+public: // actually package-private
+  virtual void paintImmediately2(jint, jint, jint, jint);
+  virtual jboolean onTop();
+  virtual jboolean isPaintRoot();
+private:
+  void paintDoubleBuffered(jint, jint, jint, jint);
+  void clipAndTranslateGraphics(::java::awt::Component *, ::java::awt::Component *, ::java::awt::Graphics *);
+public: // actually package-private
+  virtual void paintSimple(::java::awt::Rectangle *);
+public: // actually protected
+  virtual ::java::lang::String * paramString();
+public:
+  virtual void registerKeyboardAction(::java::awt::event::ActionListener *, ::javax::swing::KeyStroke *, jint);
+  virtual void registerKeyboardAction(::java::awt::event::ActionListener *, ::java::lang::String *, ::javax::swing::KeyStroke *, jint);
+  virtual void setInputMap(jint, ::javax::swing::InputMap *);
+  virtual ::javax::swing::InputMap * getInputMap(jint);
+  virtual ::javax::swing::InputMap * getInputMap();
+  virtual ::javax::swing::ActionMap * getActionMap();
+  virtual void setActionMap(::javax::swing::ActionMap *);
+  virtual jint getConditionForKeyStroke(::javax::swing::KeyStroke *);
+  virtual ::java::awt::event::ActionListener * getActionForKeyStroke(::javax::swing::KeyStroke *);
+public: // actually protected
+  virtual void processComponentKeyEvent(::java::awt::event::KeyEvent *);
+  virtual void processKeyEvent(::java::awt::event::KeyEvent *);
+  virtual jboolean processKeyBinding(::javax::swing::KeyStroke *, ::java::awt::event::KeyEvent *, jint, jboolean);
+public:
+  virtual void unregisterKeyboardAction(::javax::swing::KeyStroke *);
+  virtual void resetKeyboardActions();
+  virtual void repaint(jlong, jint, jint, jint, jint);
+  virtual void repaint(::java::awt::Rectangle *);
+  virtual jboolean requestDefaultFocus();
+  virtual void revalidate();
+  virtual void scrollRectToVisible(::java::awt::Rectangle *);
+  virtual void setAlignmentX(jfloat);
+  virtual void setAlignmentY(jfloat);
+  virtual void setAutoscrolls(jboolean);
+  virtual void setDebugGraphicsOptions(jint);
+  virtual void setDoubleBuffered(jboolean);
+  virtual void setEnabled(jboolean);
+  virtual void setFont(::java::awt::Font *);
+  virtual void setBackground(::java::awt::Color *);
+  virtual void setForeground(::java::awt::Color *);
+  virtual void setNextFocusableComponent(::java::awt::Component *);
+  virtual void setRequestFocusEnabled(jboolean);
+  virtual ::javax::swing::TransferHandler * getTransferHandler();
+  virtual void setTransferHandler(::javax::swing::TransferHandler *);
+  virtual void setOpaque(jboolean);
+  virtual void setVisible(jboolean);
+  virtual void update(::java::awt::Graphics *);
+  virtual ::java::lang::String * getUIClassID();
+public: // actually protected
+  virtual void setUI(::javax::swing::plaf::ComponentUI *);
+public:
+  virtual void updateUI();
+  static ::java::util::Locale * getDefaultLocale();
+  static void setDefaultLocale(::java::util::Locale *);
+  virtual ::javax::swing::InputVerifier * getInputVerifier();
+  virtual void setInputVerifier(::javax::swing::InputVerifier *);
+  virtual jboolean getVerifyInputWhenFocusTarget();
+  virtual void setVerifyInputWhenFocusTarget(jboolean);
+  virtual void requestFocus();
+  virtual jboolean requestFocus(jboolean);
+  virtual jboolean requestFocusInWindow();
+public: // actually protected
+  virtual jboolean requestFocusInWindow(jboolean);
+public:
+  virtual void addNotify();
+  virtual void removeNotify();
+  virtual jboolean contains(jint, jint);
+  virtual void disable();
+  virtual void enable();
+  virtual ::java::awt::Graphics * getGraphics();
+  virtual jint getX();
+  virtual jint getY();
+  virtual jint getHeight();
+  virtual jint getWidth();
+  virtual void print(::java::awt::Graphics *);
+  virtual void printAll(::java::awt::Graphics *);
+public: // actually protected
+  virtual void printComponent(::java::awt::Graphics *);
+  virtual void printChildren(::java::awt::Graphics *);
+  virtual void printBorder(::java::awt::Graphics *);
+  virtual void processMouseMotionEvent(::java::awt::event::MouseEvent *);
+public:
+  virtual void reshape(jint, jint, jint, jint);
+public: // actually package-private
+  virtual void fireAncestorEvent(::javax::swing::JComponent *, jint);
+  virtual void updateComponentInputMap(::javax::swing::ComponentInputMap *);
+  virtual void setUIProperty(::java::lang::String *, ::java::lang::Object *);
+private:
+  static const jlong serialVersionUID = -7908749299918704233LL;
+public: // actually protected
+  ::javax::accessibility::AccessibleContext * __attribute__((aligned(__alignof__( ::java::awt::Container)))) accessibleContext;
+public: // actually package-private
+  jfloat alignmentX;
+  jfloat alignmentY;
+  ::javax::swing::border::Border * border;
+  ::javax::swing::JPopupMenu * componentPopupMenu;
+  jboolean inheritsPopupMenu;
+  jboolean doubleBuffered;
+  jint debugGraphicsOptions;
+  jboolean opaque;
+public: // actually protected
+  ::javax::swing::plaf::ComponentUI * ui;
+public: // actually package-private
+  jboolean requestFocusEnabled;
+  jboolean autoscrolls;
+  static jboolean paintingDoubleBuffered;
+  static jboolean isRepainting;
+public: // actually protected
+  ::javax::swing::event::EventListenerList * listenerList;
+private:
+  ::java::beans::VetoableChangeSupport * vetoableChangeSupport;
+  ::java::util::Hashtable * clientProperties;
+  ::javax::swing::InputMap * inputMap_whenFocused;
+  ::javax::swing::InputMap * inputMap_whenAncestorOfFocused;
+  ::javax::swing::ComponentInputMap * inputMap_whenInFocusedWindow;
+  ::javax::swing::ActionMap * actionMap;
+  jboolean verifyInputWhenFocusTarget;
+  ::javax::swing::InputVerifier * inputVerifier;
+  ::javax::swing::TransferHandler * transferHandler;
+  jboolean paintingTile;
+  ::java::awt::Image * dragBuffer;
+  jboolean dragBufferInitialized;
+  static ::java::awt::Rectangle * rectCache;
+  static ::java::util::Locale * defaultLocale;
+public:
+  static ::java::lang::String * TOOL_TIP_TEXT_KEY;
+  static const jint UNDEFINED_CONDITION = -1;
+  static const jint WHEN_FOCUSED = 0;
+  static const jint WHEN_ANCESTOR_OF_FOCUSED_COMPONENT = 1;
+  static const jint WHEN_IN_FOCUSED_WINDOW = 2;
+public: // actually package-private
+  ::java::awt::Component * paintChild;
+private:
+  jboolean clientOpaqueSet;
+  jboolean clientAutoscrollsSet;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JComponent__
diff --git a/libjava/javax/swing/JDesktopPane$AccessibleJDesktopPane.h b/libjava/javax/swing/JDesktopPane$AccessibleJDesktopPane.h
new file mode 100644
index 000000000..7788b49dd
--- /dev/null
+++ b/libjava/javax/swing/JDesktopPane$AccessibleJDesktopPane.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JDesktopPane$AccessibleJDesktopPane__
+#define __javax_swing_JDesktopPane$AccessibleJDesktopPane__
+
+#pragma interface
+
+#include <javax/swing/JComponent$AccessibleJComponent.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleRole;
+    }
+    namespace swing
+    {
+        class JDesktopPane;
+        class JDesktopPane$AccessibleJDesktopPane;
+    }
+  }
+}
+
+class javax::swing::JDesktopPane$AccessibleJDesktopPane : public ::javax::swing::JComponent$AccessibleJComponent
+{
+
+public: // actually protected
+  JDesktopPane$AccessibleJDesktopPane(::javax::swing::JDesktopPane *);
+public:
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+private:
+  static const jlong serialVersionUID = 6079388927946077570LL;
+public: // actually package-private
+  ::javax::swing::JDesktopPane * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JDesktopPane$AccessibleJDesktopPane__
diff --git a/libjava/javax/swing/JDesktopPane.h b/libjava/javax/swing/JDesktopPane.h
new file mode 100644
index 000000000..d7e022c90
--- /dev/null
+++ b/libjava/javax/swing/JDesktopPane.h
@@ -0,0 +1,82 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JDesktopPane__
+#define __javax_swing_JDesktopPane__
+
+#pragma interface
+
+#include <javax/swing/JLayeredPane.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class DesktopManager;
+        class JDesktopPane;
+        class JInternalFrame;
+      namespace plaf
+      {
+          class DesktopPaneUI;
+      }
+    }
+  }
+}
+
+class javax::swing::JDesktopPane : public ::javax::swing::JLayeredPane
+{
+
+public:
+  JDesktopPane();
+  virtual ::javax::swing::plaf::DesktopPaneUI * getUI();
+  virtual void setUI(::javax::swing::plaf::DesktopPaneUI *);
+  virtual void setDragMode(jint);
+  virtual jint getDragMode();
+  virtual ::javax::swing::DesktopManager * getDesktopManager();
+  virtual void setDesktopManager(::javax::swing::DesktopManager *);
+  virtual void updateUI();
+  virtual ::java::lang::String * getUIClassID();
+  virtual JArray< ::javax::swing::JInternalFrame * > * getAllFrames();
+  virtual ::javax::swing::JInternalFrame * getSelectedFrame();
+  virtual void setSelectedFrame(::javax::swing::JInternalFrame *);
+  virtual JArray< ::javax::swing::JInternalFrame * > * getAllFramesInLayer(jint);
+  virtual jboolean isOpaque();
+public: // actually protected
+  virtual ::java::lang::String * paramString();
+private:
+  static JArray< ::javax::swing::JInternalFrame * > * getFramesFromComponents(JArray< ::java::awt::Component * > *);
+public:
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+public: // actually package-private
+  virtual void setUIProperty(::java::lang::String *, ::java::lang::Object *);
+private:
+  static const jlong serialVersionUID = 766333777224038726LL;
+public:
+  static const jint LIVE_DRAG_MODE = 0;
+  static const jint OUTLINE_DRAG_MODE = 1;
+private:
+  ::javax::swing::JInternalFrame * __attribute__((aligned(__alignof__( ::javax::swing::JLayeredPane)))) selectedFrame;
+public: // actually package-private
+  ::javax::swing::DesktopManager * desktopManager;
+private:
+  jint dragMode;
+  jboolean clientDragModeSet;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JDesktopPane__
diff --git a/libjava/javax/swing/JDialog$AccessibleJDialog.h b/libjava/javax/swing/JDialog$AccessibleJDialog.h
new file mode 100644
index 000000000..26ffba493
--- /dev/null
+++ b/libjava/javax/swing/JDialog$AccessibleJDialog.h
@@ -0,0 +1,33 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JDialog$AccessibleJDialog__
+#define __javax_swing_JDialog$AccessibleJDialog__
+
+#pragma interface
+
+#include <java/awt/Dialog$AccessibleAWTDialog.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JDialog;
+        class JDialog$AccessibleJDialog;
+    }
+  }
+}
+
+class javax::swing::JDialog$AccessibleJDialog : public ::java::awt::Dialog$AccessibleAWTDialog
+{
+
+public: // actually protected
+  JDialog$AccessibleJDialog(::javax::swing::JDialog *);
+public: // actually package-private
+  ::javax::swing::JDialog * __attribute__((aligned(__alignof__( ::java::awt::Dialog$AccessibleAWTDialog)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JDialog$AccessibleJDialog__
diff --git a/libjava/javax/swing/JDialog.h b/libjava/javax/swing/JDialog.h
new file mode 100644
index 000000000..968a0fcba
--- /dev/null
+++ b/libjava/javax/swing/JDialog.h
@@ -0,0 +1,112 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JDialog__
+#define __javax_swing_JDialog__
+
+#pragma interface
+
+#include <java/awt/Dialog.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dialog;
+        class Dimension;
+        class Frame;
+        class Graphics;
+        class GraphicsConfiguration;
+        class LayoutManager;
+      namespace event
+      {
+          class WindowEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class JDialog;
+        class JLayeredPane;
+        class JMenuBar;
+        class JRootPane;
+    }
+  }
+}
+
+class javax::swing::JDialog : public ::java::awt::Dialog
+{
+
+public:
+  JDialog();
+  JDialog(::java::awt::Dialog *);
+  JDialog(::java::awt::Dialog *, jboolean);
+  JDialog(::java::awt::Dialog *, ::java::lang::String *);
+  JDialog(::java::awt::Dialog *, ::java::lang::String *, jboolean);
+  JDialog(::java::awt::Dialog *, ::java::lang::String *, jboolean, ::java::awt::GraphicsConfiguration *);
+  JDialog(::java::awt::Frame *);
+  JDialog(::java::awt::Frame *, jboolean);
+  JDialog(::java::awt::Frame *, ::java::lang::String *);
+  JDialog(::java::awt::Frame *, ::java::lang::String *, jboolean);
+  JDialog(::java::awt::Frame *, ::java::lang::String *, jboolean, ::java::awt::GraphicsConfiguration *);
+public: // actually protected
+  virtual void dialogInit();
+public:
+  static jboolean isDefaultLookAndFeelDecorated();
+  static void setDefaultLookAndFeelDecorated(jboolean);
+  virtual ::java::awt::Dimension * getPreferredSize();
+  virtual ::javax::swing::JMenuBar * getJMenuBar();
+  virtual void setJMenuBar(::javax::swing::JMenuBar *);
+  virtual void setLayout(::java::awt::LayoutManager *);
+  virtual void setLayeredPane(::javax::swing::JLayeredPane *);
+  virtual ::javax::swing::JLayeredPane * getLayeredPane();
+  virtual ::javax::swing::JRootPane * getRootPane();
+public: // actually protected
+  virtual void setRootPane(::javax::swing::JRootPane *);
+  virtual ::javax::swing::JRootPane * createRootPane();
+public:
+  virtual ::java::awt::Container * getContentPane();
+  virtual void setContentPane(::java::awt::Container *);
+  virtual ::java::awt::Component * getGlassPane();
+  virtual void setGlassPane(::java::awt::Component *);
+public: // actually protected
+  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
+public:
+  virtual void remove(::java::awt::Component *);
+public: // actually protected
+  virtual jboolean isRootPaneCheckingEnabled();
+  virtual void setRootPaneCheckingEnabled(jboolean);
+public:
+  virtual void update(::java::awt::Graphics *);
+public: // actually protected
+  virtual void processWindowEvent(::java::awt::event::WindowEvent *);
+public:
+  virtual void setDefaultCloseOperation(jint);
+  virtual jint getDefaultCloseOperation();
+public: // actually protected
+  virtual ::java::lang::String * paramString();
+public:
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+private:
+  static const jlong serialVersionUID = -864070866424508218LL;
+public: // actually protected
+  ::javax::accessibility::AccessibleContext * __attribute__((aligned(__alignof__( ::java::awt::Dialog)))) accessibleContext;
+  ::javax::swing::JRootPane * rootPane;
+  jboolean rootPaneCheckingEnabled;
+private:
+  jint closeAction;
+  static jboolean decorated;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JDialog__
diff --git a/libjava/javax/swing/JEditorPane$1.h b/libjava/javax/swing/JEditorPane$1.h
new file mode 100644
index 000000000..9eb8b8ae0
--- /dev/null
+++ b/libjava/javax/swing/JEditorPane$1.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JEditorPane$1__
+#define __javax_swing_JEditorPane$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JEditorPane$1;
+        class JEditorPane$PlainEditorKit;
+      namespace text
+      {
+          class Element;
+          class View;
+      }
+    }
+  }
+}
+
+class javax::swing::JEditorPane$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  JEditorPane$1(::javax::swing::JEditorPane$PlainEditorKit *);
+public:
+  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *);
+public: // actually package-private
+  ::javax::swing::JEditorPane$PlainEditorKit * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JEditorPane$1__
diff --git a/libjava/javax/swing/JEditorPane$2.h b/libjava/javax/swing/JEditorPane$2.h
new file mode 100644
index 000000000..ded4334c6
--- /dev/null
+++ b/libjava/javax/swing/JEditorPane$2.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JEditorPane$2__
+#define __javax_swing_JEditorPane$2__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JEditorPane$2;
+        class JEditorPane$PageLoader;
+    }
+  }
+}
+
+class javax::swing::JEditorPane$2 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  JEditorPane$2(::javax::swing::JEditorPane$PageLoader *);
+public:
+  virtual void run();
+public: // actually package-private
+  ::javax::swing::JEditorPane$PageLoader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JEditorPane$2__
diff --git a/libjava/javax/swing/JEditorPane$AccessibleJEditorPane.h b/libjava/javax/swing/JEditorPane$AccessibleJEditorPane.h
new file mode 100644
index 000000000..9aecb469f
--- /dev/null
+++ b/libjava/javax/swing/JEditorPane$AccessibleJEditorPane.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JEditorPane$AccessibleJEditorPane__
+#define __javax_swing_JEditorPane$AccessibleJEditorPane__
+
+#pragma interface
+
+#include <javax/swing/text/JTextComponent$AccessibleJTextComponent.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleStateSet;
+    }
+    namespace swing
+    {
+        class JEditorPane;
+        class JEditorPane$AccessibleJEditorPane;
+    }
+  }
+}
+
+class javax::swing::JEditorPane$AccessibleJEditorPane : public ::javax::swing::text::JTextComponent$AccessibleJTextComponent
+{
+
+public: // actually protected
+  JEditorPane$AccessibleJEditorPane(::javax::swing::JEditorPane *);
+public:
+  virtual ::java::lang::String * getAccessibleDescription();
+  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
+public: // actually package-private
+  ::javax::swing::JEditorPane * __attribute__((aligned(__alignof__( ::javax::swing::text::JTextComponent$AccessibleJTextComponent)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JEditorPane$AccessibleJEditorPane__
diff --git a/libjava/javax/swing/JEditorPane$AccessibleJEditorPaneHTML.h b/libjava/javax/swing/JEditorPane$AccessibleJEditorPaneHTML.h
new file mode 100644
index 000000000..b9ce1d57d
--- /dev/null
+++ b/libjava/javax/swing/JEditorPane$AccessibleJEditorPaneHTML.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JEditorPane$AccessibleJEditorPaneHTML__
+#define __javax_swing_JEditorPane$AccessibleJEditorPaneHTML__
+
+#pragma interface
+
+#include <javax/swing/JEditorPane$AccessibleJEditorPane.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleText;
+    }
+    namespace swing
+    {
+        class JEditorPane;
+        class JEditorPane$AccessibleJEditorPaneHTML;
+    }
+  }
+}
+
+class javax::swing::JEditorPane$AccessibleJEditorPaneHTML : public ::javax::swing::JEditorPane$AccessibleJEditorPane
+{
+
+public: // actually protected
+  JEditorPane$AccessibleJEditorPaneHTML(::javax::swing::JEditorPane *);
+public:
+  virtual ::javax::accessibility::AccessibleText * getAccessibleText();
+public: // actually package-private
+  ::javax::swing::JEditorPane * __attribute__((aligned(__alignof__( ::javax::swing::JEditorPane$AccessibleJEditorPane)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JEditorPane$AccessibleJEditorPaneHTML__
diff --git a/libjava/javax/swing/JEditorPane$EditorKitMapping.h b/libjava/javax/swing/JEditorPane$EditorKitMapping.h
new file mode 100644
index 000000000..cb9fa757a
--- /dev/null
+++ b/libjava/javax/swing/JEditorPane$EditorKitMapping.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JEditorPane$EditorKitMapping__
+#define __javax_swing_JEditorPane$EditorKitMapping__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JEditorPane$EditorKitMapping;
+    }
+  }
+}
+
+class javax::swing::JEditorPane$EditorKitMapping : public ::java::lang::Object
+{
+
+public: // actually package-private
+  JEditorPane$EditorKitMapping(::java::lang::String *, ::java::lang::ClassLoader *);
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) className;
+  ::java::lang::ClassLoader * classLoader;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JEditorPane$EditorKitMapping__
diff --git a/libjava/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink.h b/libjava/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink.h
new file mode 100644
index 000000000..3fd5224fe
--- /dev/null
+++ b/libjava/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink__
+#define __javax_swing_JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink__
+
+#pragma interface
+
+#include <javax/accessibility/AccessibleHyperlink.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JEditorPane$JEditorPaneAccessibleHypertextSupport;
+        class JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink;
+      namespace text
+      {
+          class Element;
+      }
+    }
+  }
+}
+
+class javax::swing::JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink : public ::javax::accessibility::AccessibleHyperlink
+{
+
+public:
+  JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink(::javax::swing::JEditorPane$JEditorPaneAccessibleHypertextSupport *, ::javax::swing::text::Element *);
+  virtual jboolean isValid();
+  virtual jint getAccessibleActionCount();
+  virtual jboolean doAccessibleAction(jint);
+  virtual ::java::lang::String * getAccessibleActionDescription(jint);
+  virtual ::java::lang::Object * getAccessibleActionObject(jint);
+  virtual ::java::lang::Object * getAccessibleActionAnchor(jint);
+  virtual jint getStartIndex();
+  virtual jint getEndIndex();
+public: // actually package-private
+  ::javax::swing::text::Element * __attribute__((aligned(__alignof__( ::javax::accessibility::AccessibleHyperlink)))) element;
+  ::javax::swing::JEditorPane$JEditorPaneAccessibleHypertextSupport * this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink__
diff --git a/libjava/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport.h b/libjava/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport.h
new file mode 100644
index 000000000..759b435f4
--- /dev/null
+++ b/libjava/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JEditorPane$JEditorPaneAccessibleHypertextSupport__
+#define __javax_swing_JEditorPane$JEditorPaneAccessibleHypertextSupport__
+
+#pragma interface
+
+#include <javax/swing/JEditorPane$AccessibleJEditorPane.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleHyperlink;
+    }
+    namespace swing
+    {
+        class JEditorPane;
+        class JEditorPane$JEditorPaneAccessibleHypertextSupport;
+    }
+  }
+}
+
+class javax::swing::JEditorPane$JEditorPaneAccessibleHypertextSupport : public ::javax::swing::JEditorPane$AccessibleJEditorPane
+{
+
+public:
+  JEditorPane$JEditorPaneAccessibleHypertextSupport(::javax::swing::JEditorPane *);
+  virtual jint getLinkCount();
+  virtual ::javax::accessibility::AccessibleHyperlink * getLink(jint);
+  virtual jint getLinkIndex(jint);
+  virtual ::java::lang::String * getLinkText(jint);
+public: // actually package-private
+  static ::javax::swing::JEditorPane * access$0(::javax::swing::JEditorPane$JEditorPaneAccessibleHypertextSupport *);
+  ::javax::swing::JEditorPane * __attribute__((aligned(__alignof__( ::javax::swing::JEditorPane$AccessibleJEditorPane)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JEditorPane$JEditorPaneAccessibleHypertextSupport__
diff --git a/libjava/javax/swing/JEditorPane$PageLoader.h b/libjava/javax/swing/JEditorPane$PageLoader.h
new file mode 100644
index 000000000..6357e72a5
--- /dev/null
+++ b/libjava/javax/swing/JEditorPane$PageLoader.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JEditorPane$PageLoader__
+#define __javax_swing_JEditorPane$PageLoader__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace net
+    {
+        class URL;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JEditorPane;
+        class JEditorPane$PageLoader;
+        class JEditorPane$PageStream;
+      namespace text
+      {
+          class Document;
+      }
+    }
+  }
+}
+
+class javax::swing::JEditorPane$PageLoader : public ::java::lang::Object
+{
+
+public: // actually package-private
+  JEditorPane$PageLoader(::javax::swing::JEditorPane *, ::javax::swing::text::Document *, ::java::io::InputStream *, ::java::net::URL *, ::java::net::URL *);
+public:
+  virtual void run();
+public: // actually package-private
+  virtual void cancel();
+  static ::java::net::URL * access$0(::javax::swing::JEditorPane$PageLoader *);
+  static ::javax::swing::JEditorPane * access$1(::javax::swing::JEditorPane$PageLoader *);
+private:
+  ::javax::swing::text::Document * __attribute__((aligned(__alignof__( ::java::lang::Object)))) doc;
+  ::javax::swing::JEditorPane$PageStream * in;
+  ::java::net::URL * old;
+public: // actually package-private
+  ::java::net::URL * page;
+  ::javax::swing::JEditorPane * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JEditorPane$PageLoader__
diff --git a/libjava/javax/swing/JEditorPane$PageStream.h b/libjava/javax/swing/JEditorPane$PageStream.h
new file mode 100644
index 000000000..b4591b722
--- /dev/null
+++ b/libjava/javax/swing/JEditorPane$PageStream.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JEditorPane$PageStream__
+#define __javax_swing_JEditorPane$PageStream__
+
+#pragma interface
+
+#include <java/io/FilterInputStream.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JEditorPane;
+        class JEditorPane$PageStream;
+    }
+  }
+}
+
+class javax::swing::JEditorPane$PageStream : public ::java::io::FilterInputStream
+{
+
+public: // actually protected
+  JEditorPane$PageStream(::javax::swing::JEditorPane *, ::java::io::InputStream *);
+private:
+  void checkCancelled();
+public: // actually package-private
+  virtual void cancel();
+public:
+  virtual jint read();
+  virtual jint read(JArray< jbyte > *, jint, jint);
+  virtual jlong skip(jlong);
+  virtual jint available();
+  virtual void reset();
+private:
+  jboolean __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) cancelled;
+public: // actually package-private
+  ::javax::swing::JEditorPane * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JEditorPane$PageStream__
diff --git a/libjava/javax/swing/JEditorPane$PlainEditorKit.h b/libjava/javax/swing/JEditorPane$PlainEditorKit.h
new file mode 100644
index 000000000..39ca0d318
--- /dev/null
+++ b/libjava/javax/swing/JEditorPane$PlainEditorKit.h
@@ -0,0 +1,37 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JEditorPane$PlainEditorKit__
+#define __javax_swing_JEditorPane$PlainEditorKit__
+
+#pragma interface
+
+#include <javax/swing/text/DefaultEditorKit.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JEditorPane$PlainEditorKit;
+      namespace text
+      {
+          class ViewFactory;
+      }
+    }
+  }
+}
+
+class javax::swing::JEditorPane$PlainEditorKit : public ::javax::swing::text::DefaultEditorKit
+{
+
+  JEditorPane$PlainEditorKit();
+public:
+  virtual ::javax::swing::text::ViewFactory * getViewFactory();
+public: // actually package-private
+  JEditorPane$PlainEditorKit(::javax::swing::JEditorPane$PlainEditorKit *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JEditorPane$PlainEditorKit__
diff --git a/libjava/javax/swing/JEditorPane.h b/libjava/javax/swing/JEditorPane.h
new file mode 100644
index 000000000..0d1404cee
--- /dev/null
+++ b/libjava/javax/swing/JEditorPane.h
@@ -0,0 +1,113 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JEditorPane__
+#define __javax_swing_JEditorPane__
+
+#pragma interface
+
+#include <javax/swing/text/JTextComponent.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+    }
+    namespace net
+    {
+        class URL;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class JEditorPane;
+        class JEditorPane$PageLoader;
+      namespace event
+      {
+          class HyperlinkEvent;
+          class HyperlinkListener;
+      }
+      namespace text
+      {
+          class EditorKit;
+      }
+    }
+  }
+}
+
+class javax::swing::JEditorPane : public ::javax::swing::text::JTextComponent
+{
+
+public:
+  JEditorPane();
+  JEditorPane(::java::lang::String *);
+  JEditorPane(::java::lang::String *, ::java::lang::String *);
+  JEditorPane(::java::net::URL *);
+public: // actually package-private
+  virtual void init();
+public: // actually protected
+  virtual ::javax::swing::text::EditorKit * createDefaultEditorKit();
+public:
+  static ::javax::swing::text::EditorKit * createEditorKitForContentType(::java::lang::String *);
+  virtual void fireHyperlinkUpdate(::javax::swing::event::HyperlinkEvent *);
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+  virtual ::java::lang::String * getContentType();
+  virtual ::javax::swing::text::EditorKit * getEditorKit();
+  static ::java::lang::String * getEditorKitClassNameForContentType(::java::lang::String *);
+  virtual ::javax::swing::text::EditorKit * getEditorKitForContentType(::java::lang::String *);
+  virtual ::java::awt::Dimension * getPreferredSize();
+  virtual jboolean getScrollableTracksViewportHeight();
+  virtual jboolean getScrollableTracksViewportWidth();
+  virtual ::java::net::URL * getPage();
+public: // actually protected
+  virtual ::java::io::InputStream * getStream(::java::net::URL *);
+public:
+  virtual ::java::lang::String * getText();
+  virtual ::java::lang::String * getUIClassID();
+  virtual jboolean isFocusCycleRoot();
+public: // actually protected
+  virtual ::java::lang::String * paramString();
+public:
+  virtual void read(::java::io::InputStream *, ::java::lang::Object *);
+  static void registerEditorKitForContentType(::java::lang::String *, ::java::lang::String *);
+  static void registerEditorKitForContentType(::java::lang::String *, ::java::lang::String *, ::java::lang::ClassLoader *);
+  virtual void replaceSelection(::java::lang::String *);
+  virtual void scrollToReference(::java::lang::String *);
+  virtual void setContentType(::java::lang::String *);
+  virtual void setEditorKit(::javax::swing::text::EditorKit *);
+  virtual void setEditorKitForContentType(::java::lang::String *, ::javax::swing::text::EditorKit *);
+  virtual void setPage(::java::lang::String *);
+  virtual void setPage(::java::net::URL *);
+  virtual void setText(::java::lang::String *);
+  virtual void addHyperlinkListener(::javax::swing::event::HyperlinkListener *);
+  virtual void removeHyperlinkListener(::javax::swing::event::HyperlinkListener *);
+  virtual JArray< ::javax::swing::event::HyperlinkListener * > * getHyperlinkListeners();
+public: // actually package-private
+  static void access$0(::javax::swing::JEditorPane *, ::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *);
+private:
+  static const jlong serialVersionUID = 3140472492599046285LL;
+  ::javax::swing::text::EditorKit * __attribute__((aligned(__alignof__( ::javax::swing::text::JTextComponent)))) editorKit;
+public: // actually package-private
+  jboolean focus_root;
+  static ::java::util::HashMap * editorKits;
+  static ::java::util::HashMap * registerMap;
+  ::java::util::HashMap * editorMap;
+private:
+  ::javax::swing::JEditorPane$PageLoader * loader;
+public: // actually package-private
+  static jboolean $assertionsDisabled;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JEditorPane__
diff --git a/libjava/javax/swing/JFileChooser$1.h b/libjava/javax/swing/JFileChooser$1.h
new file mode 100644
index 000000000..87b504532
--- /dev/null
+++ b/libjava/javax/swing/JFileChooser$1.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JFileChooser$1__
+#define __javax_swing_JFileChooser$1__
+
+#pragma interface
+
+#include <java/awt/event/WindowAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class WindowEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JFileChooser;
+        class JFileChooser$1;
+    }
+  }
+}
+
+class javax::swing::JFileChooser$1 : public ::java::awt::event::WindowAdapter
+{
+
+public: // actually package-private
+  JFileChooser$1(::javax::swing::JFileChooser *);
+public:
+  virtual void windowClosing(::java::awt::event::WindowEvent *);
+public: // actually package-private
+  ::javax::swing::JFileChooser * __attribute__((aligned(__alignof__( ::java::awt::event::WindowAdapter)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JFileChooser$1__
diff --git a/libjava/javax/swing/JFileChooser$AccessibleJFileChooser.h b/libjava/javax/swing/JFileChooser$AccessibleJFileChooser.h
new file mode 100644
index 000000000..6229b49b6
--- /dev/null
+++ b/libjava/javax/swing/JFileChooser$AccessibleJFileChooser.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JFileChooser$AccessibleJFileChooser__
+#define __javax_swing_JFileChooser$AccessibleJFileChooser__
+
+#pragma interface
+
+#include <javax/swing/JComponent$AccessibleJComponent.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleRole;
+    }
+    namespace swing
+    {
+        class JFileChooser;
+        class JFileChooser$AccessibleJFileChooser;
+    }
+  }
+}
+
+class javax::swing::JFileChooser$AccessibleJFileChooser : public ::javax::swing::JComponent$AccessibleJComponent
+{
+
+public: // actually protected
+  JFileChooser$AccessibleJFileChooser(::javax::swing::JFileChooser *);
+public:
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+public: // actually package-private
+  ::javax::swing::JFileChooser * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JFileChooser$AccessibleJFileChooser__
diff --git a/libjava/javax/swing/JFileChooser.h b/libjava/javax/swing/JFileChooser.h
new file mode 100644
index 000000000..d9418e252
--- /dev/null
+++ b/libjava/javax/swing/JFileChooser.h
@@ -0,0 +1,197 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JFileChooser__
+#define __javax_swing_JFileChooser__
+
+#pragma interface
+
+#include <javax/swing/JComponent.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+      namespace event
+      {
+          class ActionListener;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class Icon;
+        class JComponent;
+        class JDialog;
+        class JFileChooser;
+      namespace filechooser
+      {
+          class FileFilter;
+          class FileSystemView;
+          class FileView;
+      }
+      namespace plaf
+      {
+          class FileChooserUI;
+      }
+    }
+  }
+}
+
+class javax::swing::JFileChooser : public ::javax::swing::JComponent
+{
+
+public:
+  JFileChooser();
+  JFileChooser(::java::lang::String *);
+  JFileChooser(::java::lang::String *, ::javax::swing::filechooser::FileSystemView *);
+  JFileChooser(::java::io::File *);
+  JFileChooser(::javax::swing::filechooser::FileSystemView *);
+  JFileChooser(::java::io::File *, ::javax::swing::filechooser::FileSystemView *);
+public: // actually protected
+  virtual void setup(::javax::swing::filechooser::FileSystemView *);
+public:
+  virtual void setDragEnabled(jboolean);
+  virtual jboolean getDragEnabled();
+  virtual ::java::io::File * getSelectedFile();
+  virtual void setSelectedFile(::java::io::File *);
+  virtual JArray< ::java::io::File * > * getSelectedFiles();
+  virtual void setSelectedFiles(JArray< ::java::io::File * > *);
+  virtual ::java::io::File * getCurrentDirectory();
+  virtual void setCurrentDirectory(::java::io::File *);
+  virtual void changeToParentDirectory();
+  virtual void rescanCurrentDirectory();
+  virtual void ensureFileIsVisible(::java::io::File *);
+  virtual jint showOpenDialog(::java::awt::Component *);
+  virtual jint showSaveDialog(::java::awt::Component *);
+  virtual jint showDialog(::java::awt::Component *, ::java::lang::String *);
+public: // actually protected
+  virtual ::javax::swing::JDialog * createDialog(::java::awt::Component *);
+public:
+  virtual jboolean getControlButtonsAreShown();
+  virtual void setControlButtonsAreShown(jboolean);
+  virtual jint getDialogType();
+  virtual void setDialogType(jint);
+  virtual void setDialogTitle(::java::lang::String *);
+  virtual ::java::lang::String * getDialogTitle();
+  virtual void setApproveButtonToolTipText(::java::lang::String *);
+  virtual ::java::lang::String * getApproveButtonToolTipText();
+  virtual jint getApproveButtonMnemonic();
+  virtual void setApproveButtonMnemonic(jint);
+  virtual void setApproveButtonMnemonic(jchar);
+  virtual void setApproveButtonText(::java::lang::String *);
+  virtual ::java::lang::String * getApproveButtonText();
+  virtual JArray< ::javax::swing::filechooser::FileFilter * > * getChoosableFileFilters();
+  virtual void addChoosableFileFilter(::javax::swing::filechooser::FileFilter *);
+  virtual jboolean removeChoosableFileFilter(::javax::swing::filechooser::FileFilter *);
+  virtual void resetChoosableFileFilters();
+  virtual ::javax::swing::filechooser::FileFilter * getAcceptAllFileFilter();
+  virtual jboolean isAcceptAllFileFilterUsed();
+  virtual void setAcceptAllFileFilterUsed(jboolean);
+  virtual ::javax::swing::JComponent * getAccessory();
+  virtual void setAccessory(::javax::swing::JComponent *);
+  virtual void setFileSelectionMode(jint);
+  virtual jint getFileSelectionMode();
+  virtual jboolean isFileSelectionEnabled();
+  virtual jboolean isDirectorySelectionEnabled();
+  virtual void setMultiSelectionEnabled(jboolean);
+  virtual jboolean isMultiSelectionEnabled();
+  virtual jboolean isFileHidingEnabled();
+  virtual void setFileHidingEnabled(jboolean);
+  virtual void setFileFilter(::javax::swing::filechooser::FileFilter *);
+  virtual ::javax::swing::filechooser::FileFilter * getFileFilter();
+  virtual void setFileView(::javax::swing::filechooser::FileView *);
+  virtual ::javax::swing::filechooser::FileView * getFileView();
+  virtual ::java::lang::String * getName(::java::io::File *);
+  virtual ::java::lang::String * getDescription(::java::io::File *);
+  virtual ::java::lang::String * getTypeDescription(::java::io::File *);
+  virtual ::javax::swing::Icon * getIcon(::java::io::File *);
+  virtual jboolean isTraversable(::java::io::File *);
+  virtual jboolean accept(::java::io::File *);
+  virtual void setFileSystemView(::javax::swing::filechooser::FileSystemView *);
+  virtual ::javax::swing::filechooser::FileSystemView * getFileSystemView();
+  virtual void approveSelection();
+  virtual void cancelSelection();
+  virtual void addActionListener(::java::awt::event::ActionListener *);
+  virtual void removeActionListener(::java::awt::event::ActionListener *);
+  virtual JArray< ::java::awt::event::ActionListener * > * getActionListeners();
+public: // actually protected
+  virtual void fireActionPerformed(::java::lang::String *);
+public:
+  virtual void updateUI();
+  virtual ::java::lang::String * getUIClassID();
+  virtual ::javax::swing::plaf::FileChooserUI * getUI();
+public: // actually protected
+  virtual ::java::lang::String * paramString();
+public:
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+private:
+  static const jlong serialVersionUID = 3162921138695327837LL;
+public:
+  static const jint OPEN_DIALOG = 0;
+  static const jint SAVE_DIALOG = 1;
+  static const jint CUSTOM_DIALOG = 2;
+  static const jint CANCEL_OPTION = 1;
+  static const jint APPROVE_OPTION = 0;
+  static const jint ERROR_OPTION = -1;
+  static const jint FILES_ONLY = 0;
+  static const jint DIRECTORIES_ONLY = 1;
+  static const jint FILES_AND_DIRECTORIES = 2;
+  static ::java::lang::String * CANCEL_SELECTION;
+  static ::java::lang::String * APPROVE_SELECTION;
+  static ::java::lang::String * APPROVE_BUTTON_TEXT_CHANGED_PROPERTY;
+  static ::java::lang::String * APPROVE_BUTTON_TOOL_TIP_TEXT_CHANGED_PROPERTY;
+  static ::java::lang::String * APPROVE_BUTTON_MNEMONIC_CHANGED_PROPERTY;
+  static ::java::lang::String * CONTROL_BUTTONS_ARE_SHOWN_CHANGED_PROPERTY;
+  static ::java::lang::String * DIRECTORY_CHANGED_PROPERTY;
+  static ::java::lang::String * SELECTED_FILE_CHANGED_PROPERTY;
+  static ::java::lang::String * SELECTED_FILES_CHANGED_PROPERTY;
+  static ::java::lang::String * MULTI_SELECTION_ENABLED_CHANGED_PROPERTY;
+  static ::java::lang::String * FILE_SYSTEM_VIEW_CHANGED_PROPERTY;
+  static ::java::lang::String * FILE_VIEW_CHANGED_PROPERTY;
+  static ::java::lang::String * FILE_HIDING_CHANGED_PROPERTY;
+  static ::java::lang::String * FILE_FILTER_CHANGED_PROPERTY;
+  static ::java::lang::String * FILE_SELECTION_MODE_CHANGED_PROPERTY;
+  static ::java::lang::String * ACCESSORY_CHANGED_PROPERTY;
+  static ::java::lang::String * ACCEPT_ALL_FILE_FILTER_USED_CHANGED_PROPERTY;
+  static ::java::lang::String * DIALOG_TITLE_CHANGED_PROPERTY;
+  static ::java::lang::String * DIALOG_TYPE_CHANGED_PROPERTY;
+  static ::java::lang::String * CHOOSABLE_FILE_FILTER_CHANGED_PROPERTY;
+public: // actually protected
+  ::javax::accessibility::AccessibleContext * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) accessibleContext;
+private:
+  ::javax::swing::filechooser::FileSystemView * fsv;
+  ::javax::swing::JComponent * accessory;
+  jint approveButtonMnemonic;
+  ::java::lang::String * approveButtonText;
+  ::java::lang::String * approveButtonToolTipText;
+  ::java::util::ArrayList * choosableFilters;
+  jboolean isAcceptAll;
+  ::java::lang::String * dialogTitle;
+  jint dialogType;
+  jint retval;
+  jboolean multiSelection;
+  jboolean fileHiding;
+  jint fileSelectionMode;
+  ::javax::swing::filechooser::FileView * fv;
+  jboolean controlButtonsShown;
+  ::java::io::File * currentDir;
+  ::javax::swing::filechooser::FileFilter * currentFilter;
+  JArray< ::java::io::File * > * selectedFiles;
+  ::java::io::File * selectedFile;
+  jboolean dragEnabled;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JFileChooser__
diff --git a/libjava/javax/swing/JFormattedTextField$AbstractFormatter.h b/libjava/javax/swing/JFormattedTextField$AbstractFormatter.h
new file mode 100644
index 000000000..d7ef6b51f
--- /dev/null
+++ b/libjava/javax/swing/JFormattedTextField$AbstractFormatter.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JFormattedTextField$AbstractFormatter__
+#define __javax_swing_JFormattedTextField$AbstractFormatter__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class Action;
+        class JFormattedTextField;
+        class JFormattedTextField$AbstractFormatter;
+      namespace text
+      {
+          class DocumentFilter;
+          class NavigationFilter;
+      }
+    }
+  }
+}
+
+class javax::swing::JFormattedTextField$AbstractFormatter : public ::java::lang::Object
+{
+
+public:
+  JFormattedTextField$AbstractFormatter();
+public: // actually protected
+  virtual ::java::lang::Object * clone();
+  virtual JArray< ::javax::swing::Action * > * getActions();
+  virtual ::javax::swing::text::DocumentFilter * getDocumentFilter();
+  virtual ::javax::swing::JFormattedTextField * getFormattedTextField();
+  virtual ::javax::swing::text::NavigationFilter * getNavigationFilter();
+public:
+  virtual void install(::javax::swing::JFormattedTextField *);
+  virtual void uninstall();
+public: // actually protected
+  virtual void invalidEdit();
+  virtual void setEditValid(jboolean);
+public:
+  virtual ::java::lang::Object * stringToValue(::java::lang::String *) = 0;
+  virtual ::java::lang::String * valueToString(::java::lang::Object *) = 0;
+private:
+  static const jlong serialVersionUID = -5193212041738979680LL;
+  ::javax::swing::JFormattedTextField * __attribute__((aligned(__alignof__( ::java::lang::Object)))) textField;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JFormattedTextField$AbstractFormatter__
diff --git a/libjava/javax/swing/JFormattedTextField$AbstractFormatterFactory.h b/libjava/javax/swing/JFormattedTextField$AbstractFormatterFactory.h
new file mode 100644
index 000000000..45c633db4
--- /dev/null
+++ b/libjava/javax/swing/JFormattedTextField$AbstractFormatterFactory.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JFormattedTextField$AbstractFormatterFactory__
+#define __javax_swing_JFormattedTextField$AbstractFormatterFactory__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JFormattedTextField;
+        class JFormattedTextField$AbstractFormatter;
+        class JFormattedTextField$AbstractFormatterFactory;
+    }
+  }
+}
+
+class javax::swing::JFormattedTextField$AbstractFormatterFactory : public ::java::lang::Object
+{
+
+public:
+  JFormattedTextField$AbstractFormatterFactory();
+  virtual ::javax::swing::JFormattedTextField$AbstractFormatter * getFormatter(::javax::swing::JFormattedTextField *) = 0;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JFormattedTextField$AbstractFormatterFactory__
diff --git a/libjava/javax/swing/JFormattedTextField.h b/libjava/javax/swing/JFormattedTextField.h
new file mode 100644
index 000000000..5c79e06e6
--- /dev/null
+++ b/libjava/javax/swing/JFormattedTextField.h
@@ -0,0 +1,98 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JFormattedTextField__
+#define __javax_swing_JFormattedTextField__
+
+#pragma interface
+
+#include <javax/swing/JTextField.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class FocusEvent;
+      }
+    }
+    namespace text
+    {
+        class Format;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Action;
+        class JFormattedTextField;
+        class JFormattedTextField$AbstractFormatter;
+        class JFormattedTextField$AbstractFormatterFactory;
+      namespace text
+      {
+          class Document;
+      }
+    }
+  }
+}
+
+class javax::swing::JFormattedTextField : public ::javax::swing::JTextField
+{
+
+public:
+  JFormattedTextField();
+  JFormattedTextField(::java::text::Format *);
+  JFormattedTextField(::javax::swing::JFormattedTextField$AbstractFormatter *);
+  JFormattedTextField(::javax::swing::JFormattedTextField$AbstractFormatterFactory *);
+  JFormattedTextField(::javax::swing::JFormattedTextField$AbstractFormatterFactory *, ::java::lang::Object *);
+  JFormattedTextField(::java::lang::Object *);
+private:
+  ::javax::swing::JFormattedTextField$AbstractFormatterFactory * getAppropriateFormatterFactory(::java::text::Format *);
+public:
+  virtual void commitEdit();
+  virtual JArray< ::javax::swing::Action * > * getActions();
+  virtual jint getFocusLostBehavior();
+  virtual ::javax::swing::JFormattedTextField$AbstractFormatter * getFormatter();
+  virtual ::javax::swing::JFormattedTextField$AbstractFormatterFactory * getFormatterFactory();
+  virtual ::java::lang::String * getUIClassID();
+  virtual ::java::lang::Object * getValue();
+public: // actually protected
+  virtual void invalidEdit();
+public:
+  virtual jboolean isEditValid();
+public: // actually protected
+  virtual void processFocusEvent(::java::awt::event::FocusEvent *);
+public:
+  virtual void setDocument(::javax::swing::text::Document *);
+  virtual void setFocusLostBehavior(jint);
+public: // actually protected
+  virtual void setFormatter(::javax::swing::JFormattedTextField$AbstractFormatter *);
+public:
+  virtual void setFormatterFactory(::javax::swing::JFormattedTextField$AbstractFormatterFactory *);
+  virtual void setValue(::java::lang::Object *);
+public: // actually package-private
+  virtual ::javax::swing::JFormattedTextField$AbstractFormatterFactory * createFormatterFactory(::java::lang::Object *);
+private:
+  static const jlong serialVersionUID = 5464657870110180632LL;
+public:
+  static const jint COMMIT = 0;
+  static const jint COMMIT_OR_REVERT = 1;
+  static const jint REVERT = 2;
+  static const jint PERSIST = 3;
+private:
+  ::java::lang::Object * __attribute__((aligned(__alignof__( ::javax::swing::JTextField)))) value;
+  jint focusLostBehavior;
+  ::javax::swing::JFormattedTextField$AbstractFormatterFactory * formatterFactory;
+  ::javax::swing::JFormattedTextField$AbstractFormatter * formatter;
+public: // actually package-private
+  jboolean editValid;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JFormattedTextField__
diff --git a/libjava/javax/swing/JFrame$AccessibleJFrame.h b/libjava/javax/swing/JFrame$AccessibleJFrame.h
new file mode 100644
index 000000000..dbb3c553f
--- /dev/null
+++ b/libjava/javax/swing/JFrame$AccessibleJFrame.h
@@ -0,0 +1,33 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JFrame$AccessibleJFrame__
+#define __javax_swing_JFrame$AccessibleJFrame__
+
+#pragma interface
+
+#include <java/awt/Frame$AccessibleAWTFrame.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JFrame;
+        class JFrame$AccessibleJFrame;
+    }
+  }
+}
+
+class javax::swing::JFrame$AccessibleJFrame : public ::java::awt::Frame$AccessibleAWTFrame
+{
+
+public: // actually protected
+  JFrame$AccessibleJFrame(::javax::swing::JFrame *);
+public: // actually package-private
+  ::javax::swing::JFrame * __attribute__((aligned(__alignof__( ::java::awt::Frame$AccessibleAWTFrame)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JFrame$AccessibleJFrame__
diff --git a/libjava/javax/swing/JFrame.h b/libjava/javax/swing/JFrame.h
new file mode 100644
index 000000000..705e200b2
--- /dev/null
+++ b/libjava/javax/swing/JFrame.h
@@ -0,0 +1,105 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JFrame__
+#define __javax_swing_JFrame__
+
+#pragma interface
+
+#include <java/awt/Frame.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+        class Graphics;
+        class GraphicsConfiguration;
+        class LayoutManager;
+      namespace event
+      {
+          class KeyEvent;
+          class WindowEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class JFrame;
+        class JLayeredPane;
+        class JMenuBar;
+        class JRootPane;
+    }
+  }
+}
+
+class javax::swing::JFrame : public ::java::awt::Frame
+{
+
+public:
+  JFrame();
+  JFrame(::java::lang::String *);
+  JFrame(::java::awt::GraphicsConfiguration *);
+  JFrame(::java::lang::String *, ::java::awt::GraphicsConfiguration *);
+public: // actually protected
+  virtual void frameInit();
+public:
+  virtual ::java::awt::Dimension * getPreferredSize();
+  virtual ::javax::swing::JMenuBar * getJMenuBar();
+  virtual void setJMenuBar(::javax::swing::JMenuBar *);
+  virtual void setLayout(::java::awt::LayoutManager *);
+  virtual void setLayeredPane(::javax::swing::JLayeredPane *);
+  virtual ::javax::swing::JLayeredPane * getLayeredPane();
+  virtual ::javax::swing::JRootPane * getRootPane();
+public: // actually protected
+  virtual void setRootPane(::javax::swing::JRootPane *);
+  virtual ::javax::swing::JRootPane * createRootPane();
+public:
+  virtual ::java::awt::Container * getContentPane();
+  virtual void setContentPane(::java::awt::Container *);
+  virtual ::java::awt::Component * getGlassPane();
+  virtual void setGlassPane(::java::awt::Component *);
+public: // actually protected
+  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
+public:
+  virtual void remove(::java::awt::Component *);
+public: // actually protected
+  virtual jboolean isRootPaneCheckingEnabled();
+  virtual void setRootPaneCheckingEnabled(jboolean);
+public:
+  virtual void update(::java::awt::Graphics *);
+public: // actually protected
+  virtual void processKeyEvent(::java::awt::event::KeyEvent *);
+public:
+  static void setDefaultLookAndFeelDecorated(jboolean);
+  static jboolean isDefaultLookAndFeelDecorated();
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+  virtual jint getDefaultCloseOperation();
+public: // actually protected
+  virtual ::java::lang::String * paramString();
+  virtual void processWindowEvent(::java::awt::event::WindowEvent *);
+public:
+  virtual void setDefaultCloseOperation(jint);
+  static const jint EXIT_ON_CLOSE = 3;
+private:
+  static const jlong serialVersionUID = -3362141868504252139LL;
+  static jboolean defaultLookAndFeelDecorated;
+  jint __attribute__((aligned(__alignof__( ::java::awt::Frame)))) closeAction;
+public: // actually protected
+  ::javax::accessibility::AccessibleContext * accessibleContext;
+  ::javax::swing::JRootPane * rootPane;
+  jboolean rootPaneCheckingEnabled;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JFrame__
diff --git a/libjava/javax/swing/JInternalFrame$AccessibleJInternalFrame.h b/libjava/javax/swing/JInternalFrame$AccessibleJInternalFrame.h
new file mode 100644
index 000000000..94749ac5a
--- /dev/null
+++ b/libjava/javax/swing/JInternalFrame$AccessibleJInternalFrame.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JInternalFrame$AccessibleJInternalFrame__
+#define __javax_swing_JInternalFrame$AccessibleJInternalFrame__
+
+#pragma interface
+
+#include <javax/swing/JComponent$AccessibleJComponent.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleRole;
+        class AccessibleValue;
+    }
+    namespace swing
+    {
+        class JInternalFrame;
+        class JInternalFrame$AccessibleJInternalFrame;
+    }
+  }
+}
+
+class javax::swing::JInternalFrame$AccessibleJInternalFrame : public ::javax::swing::JComponent$AccessibleJComponent
+{
+
+public: // actually protected
+  JInternalFrame$AccessibleJInternalFrame(::javax::swing::JInternalFrame *);
+public:
+  virtual ::java::lang::String * getAccessibleName();
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+  virtual ::javax::accessibility::AccessibleValue * getAccessibleValue();
+  virtual ::java::lang::Number * getCurrentAccessibleValue();
+  virtual ::java::lang::Number * getMaximumAccessibleValue();
+  virtual ::java::lang::Number * getMinimumAccessibleValue();
+  virtual jboolean setCurrentAccessibleValue(::java::lang::Number *);
+private:
+  static const jlong serialVersionUID = 5931936924175476797LL;
+public: // actually package-private
+  ::javax::swing::JInternalFrame * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JInternalFrame$AccessibleJInternalFrame__
diff --git a/libjava/javax/swing/JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon.h b/libjava/javax/swing/JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon.h
new file mode 100644
index 000000000..bcea0c513
--- /dev/null
+++ b/libjava/javax/swing/JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon__
+#define __javax_swing_JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon__
+
+#pragma interface
+
+#include <javax/swing/JComponent$AccessibleJComponent.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleRole;
+        class AccessibleValue;
+    }
+    namespace swing
+    {
+        class JInternalFrame$JDesktopIcon;
+        class JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon;
+    }
+  }
+}
+
+class javax::swing::JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon : public ::javax::swing::JComponent$AccessibleJComponent
+{
+
+public: // actually protected
+  JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon(::javax::swing::JInternalFrame$JDesktopIcon *);
+public:
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+  virtual ::javax::accessibility::AccessibleValue * getAccessibleValue();
+  virtual ::java::lang::Number * getCurrentAccessibleValue();
+  virtual ::java::lang::Number * getMaximumAccessibleValue();
+  virtual ::java::lang::Number * getMinimumAccessibleValue();
+  virtual jboolean setCurrentAccessibleValue(::java::lang::Number *);
+private:
+  static const jlong serialVersionUID = 5035560458941637802LL;
+public: // actually package-private
+  ::javax::swing::JInternalFrame$JDesktopIcon * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon__
diff --git a/libjava/javax/swing/JInternalFrame$JDesktopIcon.h b/libjava/javax/swing/JInternalFrame$JDesktopIcon.h
new file mode 100644
index 000000000..dc20f4d57
--- /dev/null
+++ b/libjava/javax/swing/JInternalFrame$JDesktopIcon.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JInternalFrame$JDesktopIcon__
+#define __javax_swing_JInternalFrame$JDesktopIcon__
+
+#pragma interface
+
+#include <javax/swing/JComponent.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class JDesktopPane;
+        class JInternalFrame;
+        class JInternalFrame$JDesktopIcon;
+      namespace plaf
+      {
+          class DesktopIconUI;
+      }
+    }
+  }
+}
+
+class javax::swing::JInternalFrame$JDesktopIcon : public ::javax::swing::JComponent
+{
+
+public:
+  JInternalFrame$JDesktopIcon(::javax::swing::JInternalFrame *);
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+  virtual ::javax::swing::JDesktopPane * getDesktopPane();
+  virtual ::javax::swing::JInternalFrame * getInternalFrame();
+  virtual ::javax::swing::plaf::DesktopIconUI * getUI();
+  virtual ::java::lang::String * getUIClassID();
+  virtual void setInternalFrame(::javax::swing::JInternalFrame *);
+  virtual void setUI(::javax::swing::plaf::DesktopIconUI *);
+  virtual void updateUI();
+private:
+  static const jlong serialVersionUID = 4672973344731387687LL;
+public: // actually package-private
+  ::javax::swing::JInternalFrame * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) frame;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JInternalFrame$JDesktopIcon__
diff --git a/libjava/javax/swing/JInternalFrame.h b/libjava/javax/swing/JInternalFrame.h
new file mode 100644
index 000000000..36deb84c5
--- /dev/null
+++ b/libjava/javax/swing/JInternalFrame.h
@@ -0,0 +1,192 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JInternalFrame__
+#define __javax_swing_JInternalFrame__
+
+#pragma interface
+
+#include <javax/swing/JComponent.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Graphics;
+        class LayoutManager;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class Icon;
+        class JDesktopPane;
+        class JInternalFrame;
+        class JInternalFrame$JDesktopIcon;
+        class JLayeredPane;
+        class JMenuBar;
+        class JRootPane;
+      namespace event
+      {
+          class InternalFrameListener;
+      }
+      namespace plaf
+      {
+          class InternalFrameUI;
+      }
+    }
+  }
+}
+
+class javax::swing::JInternalFrame : public ::javax::swing::JComponent
+{
+
+public:
+  JInternalFrame();
+  JInternalFrame(::java::lang::String *);
+  JInternalFrame(::java::lang::String *, jboolean);
+  JInternalFrame(::java::lang::String *, jboolean, jboolean);
+  JInternalFrame(::java::lang::String *, jboolean, jboolean, jboolean);
+  JInternalFrame(::java::lang::String *, jboolean, jboolean, jboolean, jboolean);
+public: // actually protected
+  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
+public:
+  virtual void addInternalFrameListener(::javax::swing::event::InternalFrameListener *);
+public: // actually protected
+  virtual ::javax::swing::JRootPane * createRootPane();
+public:
+  virtual void dispose();
+  virtual void doDefaultCloseAction();
+public: // actually protected
+  virtual void fireInternalFrameEvent(jint);
+public:
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+  virtual ::java::awt::Container * getContentPane();
+  virtual jint getDefaultCloseOperation();
+  virtual ::javax::swing::JInternalFrame$JDesktopIcon * getDesktopIcon();
+  virtual ::javax::swing::JDesktopPane * getDesktopPane();
+  virtual ::java::awt::Container * getFocusCycleRootAncestor();
+  virtual ::java::awt::Component * getFocusOwner();
+  virtual ::javax::swing::Icon * getFrameIcon();
+  virtual ::java::awt::Component * getGlassPane();
+  virtual JArray< ::javax::swing::event::InternalFrameListener * > * getInternalFrameListeners();
+  virtual ::javax::swing::JMenuBar * getJMenuBar();
+  virtual jint getLayer();
+  virtual ::javax::swing::JLayeredPane * getLayeredPane();
+  virtual ::javax::swing::JMenuBar * getMenuBar();
+  virtual ::java::awt::Component * getMostRecentFocusOwner();
+  virtual ::java::awt::Rectangle * getNormalBounds();
+  virtual ::javax::swing::JRootPane * getRootPane();
+  virtual ::java::lang::String * getTitle();
+  virtual ::javax::swing::plaf::InternalFrameUI * getUI();
+  virtual ::java::lang::String * getUIClassID();
+  virtual ::java::lang::String * getWarningString();
+  virtual void hide();
+  virtual jboolean isClosable();
+  virtual jboolean isClosed();
+  virtual jboolean isFocusCycleRoot();
+  virtual jboolean isIcon();
+  virtual jboolean isIconifiable();
+  virtual jboolean isMaximizable();
+  virtual jboolean isMaximum();
+  virtual jboolean isResizable();
+public: // actually protected
+  virtual jboolean isRootPaneCheckingEnabled();
+public:
+  virtual jboolean isSelected();
+  virtual void moveToBack();
+  virtual void moveToFront();
+  virtual void pack();
+public: // actually protected
+  virtual void paintComponent(::java::awt::Graphics *);
+  virtual ::java::lang::String * paramString();
+public:
+  virtual void remove(::java::awt::Component *);
+  virtual void removeInternalFrameListener(::javax::swing::event::InternalFrameListener *);
+  virtual void reshape(jint, jint, jint, jint);
+  virtual void restoreSubcomponentFocus();
+  virtual void setClosable(jboolean);
+  virtual void setClosed(jboolean);
+  virtual void setContentPane(::java::awt::Container *);
+  virtual void setDefaultCloseOperation(jint);
+  virtual void setDesktopIcon(::javax::swing::JInternalFrame$JDesktopIcon *);
+  virtual void setFocusCycleRoot(jboolean);
+  virtual void setFrameIcon(::javax::swing::Icon *);
+  virtual void setGlassPane(::java::awt::Component *);
+  virtual void setIcon(jboolean);
+  virtual void setIconifiable(jboolean);
+  virtual void setJMenuBar(::javax::swing::JMenuBar *);
+  virtual void setLayer(jint);
+  virtual void setLayer(::java::lang::Integer *);
+  virtual void setLayeredPane(::javax::swing::JLayeredPane *);
+  virtual void setMaximizable(jboolean);
+  virtual void setLayout(::java::awt::LayoutManager *);
+  virtual void setMaximum(jboolean);
+  virtual void setMenuBar(::javax::swing::JMenuBar *);
+  virtual void setNormalBounds(::java::awt::Rectangle *);
+  virtual void setResizable(jboolean);
+public: // actually protected
+  virtual void setRootPane(::javax::swing::JRootPane *);
+  virtual void setRootPaneCheckingEnabled(jboolean);
+public:
+  virtual void setSelected(jboolean);
+  virtual void setTitle(::java::lang::String *);
+  virtual void show();
+  virtual void setUI(::javax::swing::plaf::InternalFrameUI *);
+  virtual void toBack();
+  virtual void toFront();
+  virtual void updateUI();
+public: // actually package-private
+  virtual void setWasIcon(jboolean, ::java::lang::String *);
+  virtual jboolean getWasIcon();
+private:
+  void fireVetoableChange(::java::lang::String *, jboolean, jboolean);
+  static const jlong serialVersionUID = -5425177187760785402LL;
+public:
+  static ::java::lang::String * CONTENT_PANE_PROPERTY;
+  static ::java::lang::String * FRAME_ICON_PROPERTY;
+  static ::java::lang::String * GLASS_PANE_PROPERTY;
+  static ::java::lang::String * IS_CLOSED_PROPERTY;
+  static ::java::lang::String * IS_ICON_PROPERTY;
+  static ::java::lang::String * IS_MAXIMUM_PROPERTY;
+  static ::java::lang::String * IS_SELECTED_PROPERTY;
+  static ::java::lang::String * LAYERED_PANE_PROPERTY;
+  static ::java::lang::String * MENU_BAR_PROPERTY;
+  static ::java::lang::String * ROOT_PANE_PROPERTY;
+  static ::java::lang::String * TITLE_PROPERTY;
+public: // actually protected
+  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) closable;
+  jboolean iconable;
+  jboolean isClosed__;
+  jboolean isIcon__;
+  jboolean isMaximum__;
+  jboolean isSelected__;
+  jboolean maximizable;
+  jboolean rootPaneCheckingEnabled;
+  jboolean resizable;
+  ::javax::swing::JInternalFrame$JDesktopIcon * desktopIcon;
+  ::javax::swing::Icon * frameIcon;
+  ::javax::swing::JRootPane * rootPane;
+  ::java::lang::String * title;
+private:
+  ::java::awt::Rectangle * storedBounds;
+  ::java::awt::Component * defaultFocus;
+  jint defaultCloseOperation;
+  jboolean isFirstTimeVisible;
+  jboolean wasIcon;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JInternalFrame__
diff --git a/libjava/javax/swing/JLabel$AccessibleJLabel.h b/libjava/javax/swing/JLabel$AccessibleJLabel.h
new file mode 100644
index 000000000..0fb4609aa
--- /dev/null
+++ b/libjava/javax/swing/JLabel$AccessibleJLabel.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JLabel$AccessibleJLabel__
+#define __javax_swing_JLabel$AccessibleJLabel__
+
+#pragma interface
+
+#include <javax/swing/JComponent$AccessibleJComponent.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Point;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleRole;
+    }
+    namespace swing
+    {
+        class JLabel;
+        class JLabel$AccessibleJLabel;
+      namespace text
+      {
+          class AttributeSet;
+      }
+    }
+  }
+}
+
+class javax::swing::JLabel$AccessibleJLabel : public ::javax::swing::JComponent$AccessibleJComponent
+{
+
+public: // actually protected
+  JLabel$AccessibleJLabel(::javax::swing::JLabel *);
+public:
+  virtual ::java::lang::String * getAccessibleName();
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+  virtual ::java::lang::String * getSelectedText();
+  virtual jint getSelectionStart();
+  virtual jint getSelectionEnd();
+  virtual ::javax::swing::text::AttributeSet * getCharacterAttribute(jint);
+  virtual ::java::lang::String * getAtIndex(jint, jint);
+  virtual ::java::lang::String * getAfterIndex(jint, jint);
+  virtual ::java::lang::String * getBeforeIndex(jint, jint);
+  virtual jint getCaretPosition();
+  virtual jint getCharCount();
+  virtual ::java::awt::Rectangle * getCharacterBounds(jint);
+private:
+  ::java::awt::Rectangle * getTextRectangle();
+public:
+  virtual jint getIndexAtPoint(::java::awt::Point *);
+public: // actually package-private
+  ::javax::swing::JLabel * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JLabel$AccessibleJLabel__
diff --git a/libjava/javax/swing/JLabel.h b/libjava/javax/swing/JLabel.h
new file mode 100644
index 000000000..08f59ed8f
--- /dev/null
+++ b/libjava/javax/swing/JLabel.h
@@ -0,0 +1,108 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JLabel__
+#define __javax_swing_JLabel__
+
+#pragma interface
+
+#include <javax/swing/JComponent.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Font;
+        class Image;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class Icon;
+        class JLabel;
+      namespace plaf
+      {
+          class LabelUI;
+      }
+    }
+  }
+}
+
+class javax::swing::JLabel : public ::javax::swing::JComponent
+{
+
+public:
+  JLabel();
+  JLabel(::javax::swing::Icon *);
+  JLabel(::javax::swing::Icon *, jint);
+  JLabel(::java::lang::String *);
+  JLabel(::java::lang::String *, jint);
+  JLabel(::java::lang::String *, ::javax::swing::Icon *, jint);
+  virtual ::javax::swing::plaf::LabelUI * getUI();
+  virtual void setUI(::javax::swing::plaf::LabelUI *);
+  virtual void updateUI();
+  virtual ::java::lang::String * getUIClassID();
+public: // actually protected
+  virtual ::java::lang::String * paramString();
+public:
+  virtual ::java::lang::String * getText();
+  virtual void setText(::java::lang::String *);
+  virtual ::javax::swing::Icon * getIcon();
+  virtual void setIcon(::javax::swing::Icon *);
+  virtual ::javax::swing::Icon * getDisabledIcon();
+  virtual void setDisabledIcon(::javax::swing::Icon *);
+  virtual void setDisplayedMnemonic(jint);
+  virtual void setDisplayedMnemonic(jchar);
+  virtual jint getDisplayedMnemonic();
+  virtual void setDisplayedMnemonicIndex(jint);
+  virtual jint getDisplayedMnemonicIndex();
+public: // actually protected
+  virtual jint checkHorizontalKey(jint, ::java::lang::String *);
+  virtual jint checkVerticalKey(jint, ::java::lang::String *);
+public:
+  virtual jint getIconTextGap();
+  virtual void setIconTextGap(jint);
+  virtual jint getVerticalAlignment();
+  virtual void setVerticalAlignment(jint);
+  virtual jint getHorizontalAlignment();
+  virtual void setHorizontalAlignment(jint);
+  virtual jint getVerticalTextPosition();
+  virtual void setVerticalTextPosition(jint);
+  virtual jint getHorizontalTextPosition();
+  virtual void setHorizontalTextPosition(jint);
+  virtual jboolean imageUpdate(::java::awt::Image *, jint, jint, jint, jint, jint);
+  virtual ::java::awt::Component * getLabelFor();
+  virtual void setLabelFor(::java::awt::Component *);
+  virtual void setFont(::java::awt::Font *);
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+private:
+  static const jlong serialVersionUID = 5496508283662221534LL;
+public: // actually package-private
+  static ::java::lang::String * LABEL_PROPERTY;
+public: // actually protected
+  ::java::awt::Component * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) labelFor;
+public: // actually package-private
+  ::java::lang::String * text;
+private:
+  jint horizontalAlignment;
+  jint horizontalTextPosition;
+  jint verticalAlignment;
+  jint verticalTextPosition;
+  ::javax::swing::Icon * icon;
+  ::javax::swing::Icon * disabledIcon;
+  jint displayedMnemonic;
+  jint displayedMnemonicIndex;
+  jint iconTextGap;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JLabel__
diff --git a/libjava/javax/swing/JLayeredPane$AccessibleJLayeredPane.h b/libjava/javax/swing/JLayeredPane$AccessibleJLayeredPane.h
new file mode 100644
index 000000000..64eaa6d8b
--- /dev/null
+++ b/libjava/javax/swing/JLayeredPane$AccessibleJLayeredPane.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JLayeredPane$AccessibleJLayeredPane__
+#define __javax_swing_JLayeredPane$AccessibleJLayeredPane__
+
+#pragma interface
+
+#include <javax/swing/JComponent$AccessibleJComponent.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleRole;
+    }
+    namespace swing
+    {
+        class JLayeredPane;
+        class JLayeredPane$AccessibleJLayeredPane;
+    }
+  }
+}
+
+class javax::swing::JLayeredPane$AccessibleJLayeredPane : public ::javax::swing::JComponent$AccessibleJComponent
+{
+
+public: // actually protected
+  JLayeredPane$AccessibleJLayeredPane(::javax::swing::JLayeredPane *);
+public:
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+public: // actually package-private
+  ::javax::swing::JLayeredPane * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JLayeredPane$AccessibleJLayeredPane__
diff --git a/libjava/javax/swing/JLayeredPane.h b/libjava/javax/swing/JLayeredPane.h
new file mode 100644
index 000000000..3e6acaa92
--- /dev/null
+++ b/libjava/javax/swing/JLayeredPane.h
@@ -0,0 +1,89 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JLayeredPane__
+#define __javax_swing_JLayeredPane__
+
+#pragma interface
+
+#include <javax/swing/JComponent.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class JComponent;
+        class JLayeredPane;
+    }
+  }
+}
+
+class javax::swing::JLayeredPane : public ::javax::swing::JComponent
+{
+
+public:
+  JLayeredPane();
+  virtual jint getLayer(::java::awt::Component *);
+  static jint getLayer(::javax::swing::JComponent *);
+  static ::javax::swing::JLayeredPane * getLayeredPaneAbove(::java::awt::Component *);
+  virtual jint highestLayer();
+  virtual jint lowestLayer();
+  virtual void moveToFront(::java::awt::Component *);
+  virtual void moveToBack(::java::awt::Component *);
+  virtual jint getPosition(::java::awt::Component *);
+  virtual void setPosition(::java::awt::Component *, jint);
+  virtual JArray< ::java::awt::Component * > * getComponentsInLayer(jint);
+  virtual jint getComponentCountInLayer(jint);
+public: // actually protected
+  virtual ::java::util::Hashtable * getComponentToLayer();
+public:
+  virtual jint getIndexOf(::java::awt::Component *);
+public: // actually protected
+  virtual ::java::lang::Integer * getObjectForLayer(jint);
+  virtual jint insertIndexForLayer(jint, jint);
+private:
+  jint insertIndexForLayer(::java::awt::Component *, jint, jint);
+public:
+  virtual void remove(jint);
+  virtual void removeAll();
+  virtual void setLayer(::java::awt::Component *, jint);
+  virtual void setLayer(::java::awt::Component *, jint, jint);
+public: // actually protected
+  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
+public:
+  static void putLayer(::javax::swing::JComponent *, jint);
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+  virtual void paint(::java::awt::Graphics *);
+  virtual jboolean isOptimizedDrawingEnabled();
+private:
+  static const jlong serialVersionUID = 5534920399324590459LL;
+public:
+  static ::java::lang::String * LAYER_PROPERTY;
+  static ::java::lang::Integer * FRAME_CONTENT_LAYER;
+  static ::java::lang::Integer * DEFAULT_LAYER;
+  static ::java::lang::Integer * PALETTE_LAYER;
+  static ::java::lang::Integer * MODAL_LAYER;
+  static ::java::lang::Integer * POPUP_LAYER;
+  static ::java::lang::Integer * DRAG_LAYER;
+private:
+  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) componentToLayer;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JLayeredPane__
diff --git a/libjava/javax/swing/JList$1.h b/libjava/javax/swing/JList$1.h
new file mode 100644
index 000000000..8b665c7f8
--- /dev/null
+++ b/libjava/javax/swing/JList$1.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JList$1__
+#define __javax_swing_JList$1__
+
+#pragma interface
+
+#include <javax/swing/AbstractListModel.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JList;
+        class JList$1;
+    }
+  }
+}
+
+class javax::swing::JList$1 : public ::javax::swing::AbstractListModel
+{
+
+public: // actually package-private
+  JList$1(::javax::swing::JList *, JArray< ::java::lang::Object * > *);
+public:
+  virtual jint getSize();
+  virtual ::java::lang::Object * getElementAt(jint);
+public: // actually package-private
+  ::javax::swing::JList * __attribute__((aligned(__alignof__( ::javax::swing::AbstractListModel)))) this$0;
+private:
+  JArray< ::java::lang::Object * > * val$items;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JList$1__
diff --git a/libjava/javax/swing/JList$2.h b/libjava/javax/swing/JList$2.h
new file mode 100644
index 000000000..bcb6fbc59
--- /dev/null
+++ b/libjava/javax/swing/JList$2.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JList$2__
+#define __javax_swing_JList$2__
+
+#pragma interface
+
+#include <javax/swing/AbstractListModel.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JList;
+        class JList$2;
+    }
+  }
+}
+
+class javax::swing::JList$2 : public ::javax::swing::AbstractListModel
+{
+
+public: // actually package-private
+  JList$2(::javax::swing::JList *, ::java::util::Vector *);
+public:
+  virtual jint getSize();
+  virtual ::java::lang::Object * getElementAt(jint);
+public: // actually package-private
+  ::javax::swing::JList * __attribute__((aligned(__alignof__( ::javax::swing::AbstractListModel)))) this$0;
+private:
+  ::java::util::Vector * val$items;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JList$2__
diff --git a/libjava/javax/swing/JList$3.h b/libjava/javax/swing/JList$3.h
new file mode 100644
index 000000000..7c71c3076
--- /dev/null
+++ b/libjava/javax/swing/JList$3.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JList$3__
+#define __javax_swing_JList$3__
+
+#pragma interface
+
+#include <javax/swing/AbstractListModel.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JList;
+        class JList$3;
+    }
+  }
+}
+
+class javax::swing::JList$3 : public ::javax::swing::AbstractListModel
+{
+
+public: // actually package-private
+  JList$3(::javax::swing::JList *, ::java::util::Vector *);
+public:
+  virtual jint getSize();
+  virtual ::java::lang::Object * getElementAt(jint);
+public: // actually package-private
+  ::javax::swing::JList * __attribute__((aligned(__alignof__( ::javax::swing::AbstractListModel)))) this$0;
+private:
+  ::java::util::Vector * val$listData;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JList$3__
diff --git a/libjava/javax/swing/JList$AccessibleJList$AccessibleJListChild.h b/libjava/javax/swing/JList$AccessibleJList$AccessibleJListChild.h
new file mode 100644
index 000000000..1ca2d1710
--- /dev/null
+++ b/libjava/javax/swing/JList$AccessibleJList$AccessibleJListChild.h
@@ -0,0 +1,101 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JList$AccessibleJList$AccessibleJListChild__
+#define __javax_swing_JList$AccessibleJList$AccessibleJListChild__
+
+#pragma interface
+
+#include <javax/accessibility/AccessibleContext.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Cursor;
+        class Dimension;
+        class Font;
+        class FontMetrics;
+        class Point;
+        class Rectangle;
+      namespace event
+      {
+          class FocusListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+        class AccessibleContext;
+        class AccessibleRole;
+        class AccessibleStateSet;
+    }
+    namespace swing
+    {
+        class JList;
+        class JList$AccessibleJList;
+        class JList$AccessibleJList$AccessibleJListChild;
+    }
+  }
+}
+
+class javax::swing::JList$AccessibleJList$AccessibleJListChild : public ::javax::accessibility::AccessibleContext
+{
+
+public:
+  JList$AccessibleJList$AccessibleJListChild(::javax::swing::JList$AccessibleJList *, ::javax::swing::JList *, jint);
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+  virtual ::java::awt::Color * getBackground();
+  virtual void setBackground(::java::awt::Color *);
+  virtual ::java::awt::Color * getForeground();
+  virtual void setForeground(::java::awt::Color *);
+  virtual ::java::awt::Cursor * getCursor();
+  virtual void setCursor(::java::awt::Cursor *);
+  virtual ::java::awt::Font * getFont();
+  virtual void setFont(::java::awt::Font *);
+  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
+  virtual jboolean isEnabled();
+  virtual void setEnabled(jboolean);
+  virtual jboolean isVisible();
+  virtual void setVisible(jboolean);
+  virtual jboolean isShowing();
+  virtual jboolean contains(::java::awt::Point *);
+  virtual ::java::awt::Point * getLocationOnScreen();
+  virtual ::java::awt::Point * getLocation();
+  virtual void setLocation(::java::awt::Point *);
+  virtual ::java::awt::Rectangle * getBounds();
+  virtual void setBounds(::java::awt::Rectangle *);
+  virtual ::java::awt::Dimension * getSize();
+  virtual void setSize(::java::awt::Dimension *);
+  virtual ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Point *);
+  virtual jboolean isFocusTraversable();
+  virtual void requestFocus();
+  virtual void addFocusListener(::java::awt::event::FocusListener *);
+  virtual void removeFocusListener(::java::awt::event::FocusListener *);
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
+  virtual jint getAccessibleIndexInParent();
+  virtual jint getAccessibleChildrenCount();
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
+  virtual ::java::util::Locale * getLocale();
+  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
+  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
+public: // actually package-private
+  ::javax::swing::JList * __attribute__((aligned(__alignof__( ::javax::accessibility::AccessibleContext)))) parent;
+  jint listIndex;
+  ::java::awt::Cursor * cursor;
+  ::javax::swing::JList$AccessibleJList * this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JList$AccessibleJList$AccessibleJListChild__
diff --git a/libjava/javax/swing/JList$AccessibleJList.h b/libjava/javax/swing/JList$AccessibleJList.h
new file mode 100644
index 000000000..ca1842f56
--- /dev/null
+++ b/libjava/javax/swing/JList$AccessibleJList.h
@@ -0,0 +1,72 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JList$AccessibleJList__
+#define __javax_swing_JList$AccessibleJList__
+
+#pragma interface
+
+#include <javax/swing/JComponent$AccessibleJComponent.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Point;
+    }
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+        class AccessibleRole;
+        class AccessibleStateSet;
+    }
+    namespace swing
+    {
+        class JList;
+        class JList$AccessibleJList;
+      namespace event
+      {
+          class ListDataEvent;
+          class ListSelectionEvent;
+      }
+    }
+  }
+}
+
+class javax::swing::JList$AccessibleJList : public ::javax::swing::JComponent$AccessibleJComponent
+{
+
+public:
+  JList$AccessibleJList(::javax::swing::JList *);
+  virtual jint getAccessibleSelectionCount();
+  virtual ::javax::accessibility::Accessible * getAccessibleSelection(jint);
+  virtual jboolean isAccessibleChildSelected(jint);
+  virtual void addAccessibleSelection(jint);
+  virtual void removeAccessibleSelection(jint);
+  virtual void clearAccessibleSelection();
+  virtual void selectAllAccessibleSelection();
+  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *);
+  virtual void contentsChanged(::javax::swing::event::ListDataEvent *);
+  virtual void intervalAdded(::javax::swing::event::ListDataEvent *);
+  virtual void intervalRemoved(::javax::swing::event::ListDataEvent *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+  virtual ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Point *);
+  virtual jint getAccessibleChildrenCount();
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
+public: // actually package-private
+  ::javax::swing::JList * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JList$AccessibleJList__
diff --git a/libjava/javax/swing/JList$ListListener.h b/libjava/javax/swing/JList$ListListener.h
new file mode 100644
index 000000000..87854ebfd
--- /dev/null
+++ b/libjava/javax/swing/JList$ListListener.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JList$ListListener__
+#define __javax_swing_JList$ListListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JList;
+        class JList$ListListener;
+      namespace event
+      {
+          class ListDataEvent;
+          class ListSelectionEvent;
+      }
+    }
+  }
+}
+
+class javax::swing::JList$ListListener : public ::java::lang::Object
+{
+
+  JList$ListListener(::javax::swing::JList *);
+public:
+  virtual void contentsChanged(::javax::swing::event::ListDataEvent *);
+  virtual void intervalAdded(::javax::swing::event::ListDataEvent *);
+  virtual void intervalRemoved(::javax::swing::event::ListDataEvent *);
+  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *);
+public: // actually package-private
+  JList$ListListener(::javax::swing::JList *, ::javax::swing::JList$ListListener *);
+  ::javax::swing::JList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JList$ListListener__
diff --git a/libjava/javax/swing/JList.h b/libjava/javax/swing/JList.h
new file mode 100644
index 000000000..2e68ae501
--- /dev/null
+++ b/libjava/javax/swing/JList.h
@@ -0,0 +1,162 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JList__
+#define __javax_swing_JList__
+
+#pragma interface
+
+#include <javax/swing/JComponent.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Dimension;
+        class Point;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class JList;
+        class JList$ListListener;
+        class ListCellRenderer;
+        class ListModel;
+        class ListSelectionModel;
+      namespace event
+      {
+          class ListSelectionListener;
+      }
+      namespace plaf
+      {
+          class ListUI;
+      }
+      namespace text
+      {
+          class Position$Bias;
+      }
+    }
+  }
+}
+
+class javax::swing::JList : public ::javax::swing::JComponent
+{
+
+public: // actually protected
+  virtual void fireSelectionValueChanged(jint, jint, jboolean);
+public:
+  JList();
+  JList(JArray< ::java::lang::Object * > *);
+  JList(::java::util::Vector *);
+  JList(::javax::swing::ListModel *);
+private:
+  void init(::javax::swing::ListModel *);
+public: // actually protected
+  virtual ::javax::swing::ListSelectionModel * createSelectionModel();
+public:
+  virtual jint getFixedCellHeight();
+  virtual void setFixedCellHeight(jint);
+  virtual jint getFixedCellWidth();
+  virtual void setFixedCellWidth(jint);
+  virtual jint getVisibleRowCount();
+  virtual void setVisibleRowCount(jint);
+  virtual void addListSelectionListener(::javax::swing::event::ListSelectionListener *);
+  virtual void removeListSelectionListener(::javax::swing::event::ListSelectionListener *);
+  virtual JArray< ::javax::swing::event::ListSelectionListener * > * getListSelectionListeners();
+  virtual jint getSelectionMode();
+  virtual void setSelectionMode(jint);
+  virtual void setSelectedIndex(jint);
+  virtual void setSelectedIndices(JArray< jint > *);
+  virtual jint getSelectedIndex();
+  virtual jboolean isSelectionEmpty();
+  virtual jint getFirstVisibleIndex();
+  virtual jint locationToIndex(::java::awt::Point *);
+  virtual ::java::awt::Point * indexToLocation(jint);
+  virtual jint getLastVisibleIndex();
+  virtual JArray< jint > * getSelectedIndices();
+  virtual jboolean isSelectedIndex(jint);
+  virtual ::java::lang::Object * getSelectedValue();
+  virtual JArray< ::java::lang::Object * > * getSelectedValues();
+  virtual ::java::awt::Color * getSelectionBackground();
+  virtual void setSelectionBackground(::java::awt::Color *);
+  virtual ::java::awt::Color * getSelectionForeground();
+  virtual void setSelectionForeground(::java::awt::Color *);
+  virtual void setSelectedValue(::java::lang::Object *, jboolean);
+  virtual void ensureIndexIsVisible(jint);
+  virtual void setListData(JArray< ::java::lang::Object * > *);
+private:
+  ::javax::swing::ListModel * createListModel(JArray< ::java::lang::Object * > *);
+  ::javax::swing::ListModel * createListModel(::java::util::Vector *);
+public:
+  virtual void setListData(::java::util::Vector *);
+  virtual ::javax::swing::ListCellRenderer * getCellRenderer();
+  virtual void setCellRenderer(::javax::swing::ListCellRenderer *);
+  virtual ::javax::swing::ListModel * getModel();
+  virtual void setModel(::javax::swing::ListModel *);
+  virtual ::javax::swing::ListSelectionModel * getSelectionModel();
+  virtual void setSelectionModel(::javax::swing::ListSelectionModel *);
+  virtual ::javax::swing::plaf::ListUI * getUI();
+  virtual void setUI(::javax::swing::plaf::ListUI *);
+  virtual void updateUI();
+  virtual ::java::lang::String * getUIClassID();
+  virtual ::java::lang::Object * getPrototypeCellValue();
+  virtual void setPrototypeCellValue(::java::lang::Object *);
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+  virtual ::java::awt::Dimension * getPreferredScrollableViewportSize();
+  virtual jint getScrollableUnitIncrement(::java::awt::Rectangle *, jint, jint);
+  virtual jint getScrollableBlockIncrement(::java::awt::Rectangle *, jint, jint);
+  virtual jboolean getScrollableTracksViewportWidth();
+  virtual jboolean getScrollableTracksViewportHeight();
+  virtual jint getAnchorSelectionIndex();
+  virtual jint getLeadSelectionIndex();
+  virtual jint getMinSelectionIndex();
+  virtual jint getMaxSelectionIndex();
+  virtual void clearSelection();
+  virtual void setSelectionInterval(jint, jint);
+  virtual void addSelectionInterval(jint, jint);
+  virtual void removeSelectionInterval(jint, jint);
+  virtual jboolean getValueIsAdjusting();
+  virtual void setValueIsAdjusting(jboolean);
+  virtual jboolean getDragEnabled();
+  virtual void setDragEnabled(jboolean);
+  virtual jint getLayoutOrientation();
+  virtual void setLayoutOrientation(jint);
+  virtual ::java::awt::Rectangle * getCellBounds(jint, jint);
+  virtual jint getNextMatch(::java::lang::String *, jint, ::javax::swing::text::Position$Bias *);
+public: // actually protected
+  virtual ::java::lang::String * paramString();
+private:
+  static const jlong serialVersionUID = 4406629526391098046LL;
+public:
+  static const jint VERTICAL = 0;
+  static const jint VERTICAL_WRAP = 1;
+  static const jint HORIZONTAL_WRAP = 2;
+public: // actually package-private
+  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) dragEnabled;
+  ::javax::swing::ListCellRenderer * cellRenderer;
+  jint fixedCellWidth;
+  jint fixedCellHeight;
+  jint layoutOrientation;
+  ::javax::swing::ListModel * model;
+  ::java::lang::Object * prototypeCellValue;
+  ::java::awt::Color * selectionBackground;
+  ::java::awt::Color * selectionForeground;
+  ::javax::swing::ListSelectionModel * selectionModel;
+  jint visibleRowCount;
+  ::javax::swing::JList$ListListener * listListener;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JList__
diff --git a/libjava/javax/swing/JMenu$AccessibleJMenu.h b/libjava/javax/swing/JMenu$AccessibleJMenu.h
new file mode 100644
index 000000000..6c892b491
--- /dev/null
+++ b/libjava/javax/swing/JMenu$AccessibleJMenu.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JMenu$AccessibleJMenu__
+#define __javax_swing_JMenu$AccessibleJMenu__
+
+#pragma interface
+
+#include <javax/swing/JMenuItem$AccessibleJMenuItem.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+        class AccessibleRole;
+        class AccessibleSelection;
+    }
+    namespace swing
+    {
+        class JMenu;
+        class JMenu$AccessibleJMenu;
+    }
+  }
+}
+
+class javax::swing::JMenu$AccessibleJMenu : public ::javax::swing::JMenuItem$AccessibleJMenuItem
+{
+
+public: // actually protected
+  JMenu$AccessibleJMenu(::javax::swing::JMenu *);
+public:
+  virtual jint getAccessibleChildrenCount();
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
+  virtual ::javax::accessibility::AccessibleSelection * getAccessibleSelection();
+  virtual ::javax::accessibility::Accessible * getAccessibleSelection(jint);
+  virtual jboolean isAccessibleChildSelected(jint);
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+  virtual jint getAccessibleSelectionCount();
+  virtual void addAccessibleSelection(jint);
+  virtual void removeAccessibleSelection(jint);
+  virtual void clearAccessibleSelection();
+  virtual void selectAllAccessibleSelection();
+private:
+  static const jlong serialVersionUID = -8131864021059524309LL;
+public: // actually package-private
+  ::javax::swing::JMenu * __attribute__((aligned(__alignof__( ::javax::swing::JMenuItem$AccessibleJMenuItem)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JMenu$AccessibleJMenu__
diff --git a/libjava/javax/swing/JMenu$ActionChangedListener.h b/libjava/javax/swing/JMenu$ActionChangedListener.h
new file mode 100644
index 000000000..36623cf27
--- /dev/null
+++ b/libjava/javax/swing/JMenu$ActionChangedListener.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JMenu$ActionChangedListener__
+#define __javax_swing_JMenu$ActionChangedListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JMenu;
+        class JMenu$ActionChangedListener;
+        class JMenuItem;
+    }
+  }
+}
+
+class javax::swing::JMenu$ActionChangedListener : public ::java::lang::Object
+{
+
+public:
+  JMenu$ActionChangedListener(::javax::swing::JMenu *, ::javax::swing::JMenuItem *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+private:
+  ::javax::swing::JMenuItem * __attribute__((aligned(__alignof__( ::java::lang::Object)))) menuItem;
+public: // actually package-private
+  ::javax::swing::JMenu * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JMenu$ActionChangedListener__
diff --git a/libjava/javax/swing/JMenu$MenuChangeListener.h b/libjava/javax/swing/JMenu$MenuChangeListener.h
new file mode 100644
index 000000000..816f33e54
--- /dev/null
+++ b/libjava/javax/swing/JMenu$MenuChangeListener.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JMenu$MenuChangeListener__
+#define __javax_swing_JMenu$MenuChangeListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JMenu;
+        class JMenu$MenuChangeListener;
+      namespace event
+      {
+          class ChangeEvent;
+      }
+    }
+  }
+}
+
+class javax::swing::JMenu$MenuChangeListener : public ::java::lang::Object
+{
+
+  JMenu$MenuChangeListener(::javax::swing::JMenu *);
+public:
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+public: // actually package-private
+  JMenu$MenuChangeListener(::javax::swing::JMenu *, ::javax::swing::JMenu$MenuChangeListener *);
+private:
+  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) selected;
+public: // actually package-private
+  ::javax::swing::JMenu * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JMenu$MenuChangeListener__
diff --git a/libjava/javax/swing/JMenu$WinListener.h b/libjava/javax/swing/JMenu$WinListener.h
new file mode 100644
index 000000000..e685e382e
--- /dev/null
+++ b/libjava/javax/swing/JMenu$WinListener.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JMenu$WinListener__
+#define __javax_swing_JMenu$WinListener__
+
+#pragma interface
+
+#include <java/awt/event/WindowAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class WindowEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JMenu;
+        class JMenu$WinListener;
+        class JPopupMenu;
+    }
+  }
+}
+
+class javax::swing::JMenu$WinListener : public ::java::awt::event::WindowAdapter
+{
+
+public:
+  JMenu$WinListener(::javax::swing::JMenu *, ::javax::swing::JPopupMenu *);
+  virtual void windowClosing(::java::awt::event::WindowEvent *);
+private:
+  static const jlong serialVersionUID = -6415815570638474823LL;
+public: // actually package-private
+  ::javax::swing::JMenu * __attribute__((aligned(__alignof__( ::java::awt::event::WindowAdapter)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JMenu$WinListener__
diff --git a/libjava/javax/swing/JMenu.h b/libjava/javax/swing/JMenu.h
new file mode 100644
index 000000000..112d995a0
--- /dev/null
+++ b/libjava/javax/swing/JMenu.h
@@ -0,0 +1,141 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JMenu__
+#define __javax_swing_JMenu__
+
+#pragma interface
+
+#include <javax/swing/JMenuItem.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Point;
+      namespace event
+      {
+          class KeyEvent;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class Action;
+        class ButtonModel;
+        class JMenu;
+        class JMenu$WinListener;
+        class JMenuItem;
+        class JPopupMenu;
+        class KeyStroke;
+        class MenuElement;
+      namespace event
+      {
+          class ChangeListener;
+          class MenuEvent;
+          class MenuListener;
+      }
+    }
+  }
+}
+
+class javax::swing::JMenu : public ::javax::swing::JMenuItem
+{
+
+public:
+  JMenu();
+  JMenu(::java::lang::String *);
+  JMenu(::javax::swing::Action *);
+  JMenu(::java::lang::String *, jboolean);
+  virtual ::javax::swing::JMenuItem * add(::javax::swing::JMenuItem *);
+  virtual ::java::awt::Component * add(::java::awt::Component *);
+  virtual ::java::awt::Component * add(::java::awt::Component *, jint);
+  virtual ::javax::swing::JMenuItem * add(::java::lang::String *);
+  virtual ::javax::swing::JMenuItem * add(::javax::swing::Action *);
+  virtual void remove(::javax::swing::JMenuItem *);
+  virtual void remove(jint);
+  virtual void remove(::java::awt::Component *);
+  virtual void removeAll();
+  virtual void insert(::java::lang::String *, jint);
+  virtual ::javax::swing::JMenuItem * insert(::javax::swing::JMenuItem *, jint);
+  virtual ::javax::swing::JMenuItem * insert(::javax::swing::Action *, jint);
+  virtual void updateUI();
+  virtual ::java::lang::String * getUIClassID();
+  virtual void setModel(::javax::swing::ButtonModel *);
+  virtual jboolean isSelected();
+  virtual void setSelected(jboolean);
+  virtual jboolean isPopupMenuVisible();
+  virtual void setPopupMenuVisible(jboolean);
+public: // actually protected
+  virtual ::java::awt::Point * getPopupMenuOrigin();
+public:
+  virtual jint getDelay();
+  virtual void setDelay(jint);
+  virtual void setMenuLocation(jint, jint);
+public: // actually protected
+  virtual ::javax::swing::JMenuItem * createActionComponent(::javax::swing::Action *);
+  virtual ::java::beans::PropertyChangeListener * createActionChangeListener(::javax::swing::JMenuItem *);
+public:
+  virtual void addSeparator();
+  virtual void insertSeparator(jint);
+  virtual ::javax::swing::JMenuItem * getItem(jint);
+  virtual jint getItemCount();
+  virtual jboolean isTearOff();
+  virtual jint getMenuComponentCount();
+  virtual ::java::awt::Component * getMenuComponent(jint);
+  virtual JArray< ::java::awt::Component * > * getMenuComponents();
+  virtual jboolean isTopLevelMenu();
+  virtual jboolean isMenuComponent(::java::awt::Component *);
+  virtual ::javax::swing::JPopupMenu * getPopupMenu();
+  virtual void addMenuListener(::javax::swing::event::MenuListener *);
+  virtual void removeMenuListener(::javax::swing::event::MenuListener *);
+  virtual JArray< ::javax::swing::event::MenuListener * > * getMenuListeners();
+public: // actually protected
+  virtual void fireMenuSelected();
+  virtual void fireMenuDeselected();
+  virtual void fireMenuCanceled();
+  virtual ::javax::swing::JMenu$WinListener * createWinListener(::javax::swing::JPopupMenu *);
+public:
+  virtual void menuSelectionChanged(jboolean);
+  virtual JArray< ::javax::swing::MenuElement * > * getSubElements();
+  virtual ::java::awt::Component * getComponent();
+  virtual void setAccelerator(::javax::swing::KeyStroke *);
+public: // actually protected
+  virtual void processKeyEvent(::java::awt::event::KeyEvent *);
+public:
+  virtual void doClick(jint);
+public: // actually protected
+  virtual ::java::lang::String * paramString();
+public:
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+public: // actually package-private
+  virtual JArray< ::javax::swing::MenuElement * > * createPath(::javax::swing::JMenu *);
+private:
+  static const jlong serialVersionUID = 4227225638931828014LL;
+  ::javax::swing::JPopupMenu * __attribute__((aligned(__alignof__( ::javax::swing::JMenuItem)))) popupMenu;
+  ::javax::swing::event::MenuEvent * menuEvent;
+  jint delay;
+public: // actually protected
+  ::javax::swing::JMenu$WinListener * popupListener;
+private:
+  ::java::awt::Point * menuLocation;
+  ::javax::swing::event::ChangeListener * menuChangeListener;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JMenu__
diff --git a/libjava/javax/swing/JMenuBar$AccessibleJMenuBar.h b/libjava/javax/swing/JMenuBar$AccessibleJMenuBar.h
new file mode 100644
index 000000000..2fcf3ad86
--- /dev/null
+++ b/libjava/javax/swing/JMenuBar$AccessibleJMenuBar.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JMenuBar$AccessibleJMenuBar__
+#define __javax_swing_JMenuBar$AccessibleJMenuBar__
+
+#pragma interface
+
+#include <javax/swing/JComponent$AccessibleJComponent.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+        class AccessibleRole;
+        class AccessibleSelection;
+        class AccessibleStateSet;
+    }
+    namespace swing
+    {
+        class JMenuBar;
+        class JMenuBar$AccessibleJMenuBar;
+    }
+  }
+}
+
+class javax::swing::JMenuBar$AccessibleJMenuBar : public ::javax::swing::JComponent$AccessibleJComponent
+{
+
+public: // actually protected
+  JMenuBar$AccessibleJMenuBar(::javax::swing::JMenuBar *);
+public:
+  virtual jint getAccessibleSelectionCount();
+  virtual ::javax::accessibility::Accessible * getAccessibleSelection(jint);
+  virtual jboolean isAccessibleChildSelected(jint);
+  virtual void addAccessibleSelection(jint);
+  virtual void removeAccessibleSelection(jint);
+  virtual void clearAccessibleSelection();
+  virtual void selectAllAccessibleSelection();
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+  virtual ::javax::accessibility::AccessibleSelection * getAccessibleSelection();
+  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
+public: // actually package-private
+  ::javax::swing::JMenuBar * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JMenuBar$AccessibleJMenuBar__
diff --git a/libjava/javax/swing/JMenuBar.h b/libjava/javax/swing/JMenuBar.h
new file mode 100644
index 000000000..a33d051ba
--- /dev/null
+++ b/libjava/javax/swing/JMenuBar.h
@@ -0,0 +1,100 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JMenuBar__
+#define __javax_swing_JMenuBar__
+
+#pragma interface
+
+#include <javax/swing/JComponent.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+      namespace event
+      {
+          class KeyEvent;
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class JMenu;
+        class JMenuBar;
+        class KeyStroke;
+        class MenuElement;
+        class MenuSelectionManager;
+        class SingleSelectionModel;
+      namespace plaf
+      {
+          class MenuBarUI;
+      }
+    }
+  }
+}
+
+class javax::swing::JMenuBar : public ::javax::swing::JComponent
+{
+
+public:
+  JMenuBar();
+  virtual ::javax::swing::JMenu * add(::javax::swing::JMenu *);
+  virtual void addNotify();
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+  virtual ::java::awt::Component * getComponent();
+  virtual ::java::awt::Component * getComponentAtIndex(jint);
+  virtual jint getComponentIndex(::java::awt::Component *);
+  virtual ::javax::swing::JMenu * getHelpMenu();
+  virtual ::java::awt::Insets * getMargin();
+  virtual ::javax::swing::JMenu * getMenu(jint);
+  virtual jint getMenuCount();
+  virtual ::javax::swing::SingleSelectionModel * getSelectionModel();
+  virtual JArray< ::javax::swing::MenuElement * > * getSubElements();
+  virtual ::javax::swing::plaf::MenuBarUI * getUI();
+  virtual ::java::lang::String * getUIClassID();
+  virtual jboolean isBorderPainted();
+  virtual jboolean isSelected();
+  virtual void menuSelectionChanged(jboolean);
+public: // actually protected
+  virtual void paintBorder(::java::awt::Graphics *);
+  virtual ::java::lang::String * paramString();
+public:
+  virtual void processKeyEvent(::java::awt::event::KeyEvent *, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *);
+public: // actually protected
+  virtual jboolean processKeyBinding(::javax::swing::KeyStroke *, ::java::awt::event::KeyEvent *, jint, jboolean);
+public: // actually package-private
+  static jboolean processKeyBindingHelper(::javax::swing::MenuElement *, ::javax::swing::KeyStroke *, ::java::awt::event::KeyEvent *, jint, jboolean);
+public:
+  virtual void processMouseEvent(::java::awt::event::MouseEvent *, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *);
+  virtual void removeNotify();
+  virtual void setBorderPainted(jboolean);
+  virtual void setHelpMenu(::javax::swing::JMenu *);
+  virtual void setMargin(::java::awt::Insets *);
+  virtual void setSelected(::java::awt::Component *);
+  virtual void setSelectionModel(::javax::swing::SingleSelectionModel *);
+  virtual void setUI(::javax::swing::plaf::MenuBarUI *);
+  virtual void updateUI();
+private:
+  static const jlong serialVersionUID = -8191026883931977036LL;
+  ::javax::swing::SingleSelectionModel * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) selectionModel;
+  jboolean borderPainted;
+  ::java::awt::Insets * margin;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JMenuBar__
diff --git a/libjava/javax/swing/JMenuItem$1.h b/libjava/javax/swing/JMenuItem$1.h
new file mode 100644
index 000000000..566427142
--- /dev/null
+++ b/libjava/javax/swing/JMenuItem$1.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JMenuItem$1__
+#define __javax_swing_JMenuItem$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JMenuItem;
+        class JMenuItem$1;
+    }
+  }
+}
+
+class javax::swing::JMenuItem$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  JMenuItem$1(::javax::swing::JMenuItem *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::JMenuItem * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JMenuItem$1__
diff --git a/libjava/javax/swing/JMenuItem$AccessibleJMenuItem.h b/libjava/javax/swing/JMenuItem$AccessibleJMenuItem.h
new file mode 100644
index 000000000..7e67e9df9
--- /dev/null
+++ b/libjava/javax/swing/JMenuItem$AccessibleJMenuItem.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JMenuItem$AccessibleJMenuItem__
+#define __javax_swing_JMenuItem$AccessibleJMenuItem__
+
+#pragma interface
+
+#include <javax/swing/AbstractButton$AccessibleAbstractButton.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleRole;
+    }
+    namespace swing
+    {
+        class JMenuItem;
+        class JMenuItem$AccessibleJMenuItem;
+      namespace event
+      {
+          class ChangeEvent;
+      }
+    }
+  }
+}
+
+class javax::swing::JMenuItem$AccessibleJMenuItem : public ::javax::swing::AbstractButton$AccessibleAbstractButton
+{
+
+public: // actually package-private
+  JMenuItem$AccessibleJMenuItem(::javax::swing::JMenuItem *);
+public:
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+private:
+  static const jlong serialVersionUID = 6748924232082076534LL;
+  jboolean __attribute__((aligned(__alignof__( ::javax::swing::AbstractButton$AccessibleAbstractButton)))) armed;
+  jboolean focusOwner;
+  jboolean pressed;
+  jboolean selected;
+public: // actually package-private
+  ::javax::swing::JMenuItem * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JMenuItem$AccessibleJMenuItem__
diff --git a/libjava/javax/swing/JMenuItem.h b/libjava/javax/swing/JMenuItem.h
new file mode 100644
index 000000000..87d5ff98f
--- /dev/null
+++ b/libjava/javax/swing/JMenuItem.h
@@ -0,0 +1,120 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JMenuItem__
+#define __javax_swing_JMenuItem__
+
+#pragma interface
+
+#include <javax/swing/AbstractButton.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+      namespace event
+      {
+          class KeyEvent;
+          class MouseEvent;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class Action;
+        class Icon;
+        class JMenuItem;
+        class KeyStroke;
+        class MenuElement;
+        class MenuSelectionManager;
+      namespace event
+      {
+          class MenuDragMouseEvent;
+          class MenuDragMouseListener;
+          class MenuKeyEvent;
+          class MenuKeyListener;
+      }
+      namespace plaf
+      {
+          class MenuItemUI;
+      }
+    }
+  }
+}
+
+class javax::swing::JMenuItem : public ::javax::swing::AbstractButton
+{
+
+public:
+  JMenuItem();
+  JMenuItem(::javax::swing::Icon *);
+  JMenuItem(::java::lang::String *);
+  JMenuItem(::javax::swing::Action *);
+  JMenuItem(::java::lang::String *, ::javax::swing::Icon *);
+  JMenuItem(::java::lang::String *, jint);
+public: // actually protected
+  virtual void init(::java::lang::String *, ::javax::swing::Icon *);
+public:
+  virtual void setUI(::javax::swing::plaf::MenuItemUI *);
+  virtual void updateUI();
+  virtual ::java::lang::String * getUIClassID();
+  virtual jboolean isArmed();
+  virtual void setArmed(jboolean);
+  virtual void setEnabled(jboolean);
+  virtual ::javax::swing::KeyStroke * getAccelerator();
+  virtual void setAccelerator(::javax::swing::KeyStroke *);
+public: // actually protected
+  virtual void configurePropertiesFromAction(::javax::swing::Action *);
+  virtual ::java::beans::PropertyChangeListener * createActionPropertyChangeListener(::javax::swing::Action *);
+public:
+  virtual void processMouseEvent(::java::awt::event::MouseEvent *, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *);
+  virtual void processKeyEvent(::java::awt::event::KeyEvent *, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *);
+  virtual void processMenuDragMouseEvent(::javax::swing::event::MenuDragMouseEvent *);
+  virtual void processMenuKeyEvent(::javax::swing::event::MenuKeyEvent *);
+public: // actually protected
+  virtual void fireMenuDragMouseEntered(::javax::swing::event::MenuDragMouseEvent *);
+  virtual void fireMenuDragMouseExited(::javax::swing::event::MenuDragMouseEvent *);
+  virtual void fireMenuDragMouseDragged(::javax::swing::event::MenuDragMouseEvent *);
+  virtual void fireMenuDragMouseReleased(::javax::swing::event::MenuDragMouseEvent *);
+  virtual void fireMenuKeyPressed(::javax::swing::event::MenuKeyEvent *);
+  virtual void fireMenuKeyReleased(::javax::swing::event::MenuKeyEvent *);
+  virtual void fireMenuKeyTyped(::javax::swing::event::MenuKeyEvent *);
+public:
+  virtual void menuSelectionChanged(jboolean);
+  virtual JArray< ::javax::swing::MenuElement * > * getSubElements();
+  virtual ::java::awt::Component * getComponent();
+  virtual void addMenuDragMouseListener(::javax::swing::event::MenuDragMouseListener *);
+  virtual void removeMenuDragMouseListener(::javax::swing::event::MenuDragMouseListener *);
+  virtual JArray< ::javax::swing::event::MenuDragMouseListener * > * getMenuDragMouseListeners();
+  virtual void addMenuKeyListener(::javax::swing::event::MenuKeyListener *);
+  virtual void removeMenuKeyListener(::javax::swing::event::MenuKeyListener *);
+  virtual JArray< ::javax::swing::event::MenuKeyListener * > * getMenuKeyListeners();
+public: // actually protected
+  virtual ::java::lang::String * paramString();
+public:
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+public: // actually package-private
+  virtual jboolean onTop();
+private:
+  static const jlong serialVersionUID = -1681004643499461044LL;
+  ::javax::swing::KeyStroke * __attribute__((aligned(__alignof__( ::javax::swing::AbstractButton)))) accelerator;
+  jboolean isDragging;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JMenuItem__
diff --git a/libjava/javax/swing/JOptionPane$1.h b/libjava/javax/swing/JOptionPane$1.h
new file mode 100644
index 000000000..89b46f359
--- /dev/null
+++ b/libjava/javax/swing/JOptionPane$1.h
@@ -0,0 +1,30 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JOptionPane$1__
+#define __javax_swing_JOptionPane$1__
+
+#pragma interface
+
+#include <java/awt/event/MouseAdapter.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JOptionPane$1;
+    }
+  }
+}
+
+class javax::swing::JOptionPane$1 : public ::java::awt::event::MouseAdapter
+{
+
+public: // actually package-private
+  JOptionPane$1();
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JOptionPane$1__
diff --git a/libjava/javax/swing/JOptionPane$2.h b/libjava/javax/swing/JOptionPane$2.h
new file mode 100644
index 000000000..9231d656a
--- /dev/null
+++ b/libjava/javax/swing/JOptionPane$2.h
@@ -0,0 +1,30 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JOptionPane$2__
+#define __javax_swing_JOptionPane$2__
+
+#pragma interface
+
+#include <java/awt/event/MouseMotionAdapter.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JOptionPane$2;
+    }
+  }
+}
+
+class javax::swing::JOptionPane$2 : public ::java::awt::event::MouseMotionAdapter
+{
+
+public: // actually package-private
+  JOptionPane$2();
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JOptionPane$2__
diff --git a/libjava/javax/swing/JOptionPane$AccessibleJOptionPane.h b/libjava/javax/swing/JOptionPane$AccessibleJOptionPane.h
new file mode 100644
index 000000000..70b9e984f
--- /dev/null
+++ b/libjava/javax/swing/JOptionPane$AccessibleJOptionPane.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JOptionPane$AccessibleJOptionPane__
+#define __javax_swing_JOptionPane$AccessibleJOptionPane__
+
+#pragma interface
+
+#include <javax/swing/JComponent$AccessibleJComponent.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleRole;
+    }
+    namespace swing
+    {
+        class JOptionPane;
+        class JOptionPane$AccessibleJOptionPane;
+    }
+  }
+}
+
+class javax::swing::JOptionPane$AccessibleJOptionPane : public ::javax::swing::JComponent$AccessibleJComponent
+{
+
+public: // actually protected
+  JOptionPane$AccessibleJOptionPane(::javax::swing::JOptionPane *);
+public:
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+private:
+  static const jlong serialVersionUID = 686071432213084821LL;
+public: // actually package-private
+  ::javax::swing::JOptionPane * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JOptionPane$AccessibleJOptionPane__
diff --git a/libjava/javax/swing/JOptionPane$ValuePropertyHandler.h b/libjava/javax/swing/JOptionPane$ValuePropertyHandler.h
new file mode 100644
index 000000000..a3d71cf40
--- /dev/null
+++ b/libjava/javax/swing/JOptionPane$ValuePropertyHandler.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JOptionPane$ValuePropertyHandler__
+#define __javax_swing_JOptionPane$ValuePropertyHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JDialog;
+        class JOptionPane$ValuePropertyHandler;
+    }
+  }
+}
+
+class javax::swing::JOptionPane$ValuePropertyHandler : public ::java::lang::Object
+{
+
+public: // actually package-private
+  JOptionPane$ValuePropertyHandler(::javax::swing::JDialog *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::JDialog * __attribute__((aligned(__alignof__( ::java::lang::Object)))) dialog;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JOptionPane$ValuePropertyHandler__
diff --git a/libjava/javax/swing/JOptionPane.h b/libjava/javax/swing/JOptionPane.h
new file mode 100644
index 000000000..5bd63fd7a
--- /dev/null
+++ b/libjava/javax/swing/JOptionPane.h
@@ -0,0 +1,167 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JOptionPane__
+#define __javax_swing_JOptionPane__
+
+#pragma interface
+
+#include <javax/swing/JComponent.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Frame;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class Icon;
+        class JDesktopPane;
+        class JDialog;
+        class JInternalFrame;
+        class JOptionPane;
+      namespace plaf
+      {
+          class OptionPaneUI;
+      }
+    }
+  }
+}
+
+class javax::swing::JOptionPane : public ::javax::swing::JComponent
+{
+
+public:
+  JOptionPane();
+  JOptionPane(::java::lang::Object *);
+  JOptionPane(::java::lang::Object *, jint);
+  JOptionPane(::java::lang::Object *, jint, jint);
+  JOptionPane(::java::lang::Object *, jint, jint, ::javax::swing::Icon *);
+  JOptionPane(::java::lang::Object *, jint, jint, ::javax::swing::Icon *, JArray< ::java::lang::Object * > *);
+  JOptionPane(::java::lang::Object *, jint, jint, ::javax::swing::Icon *, JArray< ::java::lang::Object * > *, ::java::lang::Object *);
+  virtual ::javax::swing::JDialog * createDialog(::java::awt::Component *, ::java::lang::String *);
+  virtual ::javax::swing::JInternalFrame * createInternalFrame(::java::awt::Component *, ::java::lang::String *);
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+  static ::javax::swing::JDesktopPane * getDesktopPaneForComponent(::java::awt::Component *);
+  static ::java::awt::Frame * getFrameForComponent(::java::awt::Component *);
+  virtual ::javax::swing::Icon * getIcon();
+  virtual ::java::lang::Object * getInitialSelectionValue();
+  virtual ::java::lang::Object * getInitialValue();
+  virtual ::java::lang::Object * getInputValue();
+  virtual jint getMaxCharactersPerLineCount();
+  virtual ::java::lang::Object * getMessage();
+  virtual jint getMessageType();
+  virtual JArray< ::java::lang::Object * > * getOptions();
+  virtual jint getOptionType();
+  static ::java::awt::Frame * getRootFrame();
+  virtual JArray< ::java::lang::Object * > * getSelectionValues();
+  virtual ::javax::swing::plaf::OptionPaneUI * getUI();
+  virtual ::java::lang::String * getUIClassID();
+  virtual ::java::lang::Object * getValue();
+  virtual jboolean getWantsInput();
+public: // actually protected
+  virtual ::java::lang::String * paramString();
+public:
+  virtual void selectInitialValue();
+  virtual void setIcon(::javax::swing::Icon *);
+  virtual void setInitialSelectionValue(::java::lang::Object *);
+  virtual void setInitialValue(::java::lang::Object *);
+  virtual void setInputValue(::java::lang::Object *);
+  virtual void setMessage(::java::lang::Object *);
+  virtual void setMessageType(jint);
+  virtual void setOptions(JArray< ::java::lang::Object * > *);
+  virtual void setOptionType(jint);
+  static void setRootFrame(::java::awt::Frame *);
+  virtual void setSelectionValues(JArray< ::java::lang::Object * > *);
+  virtual void setUI(::javax::swing::plaf::OptionPaneUI *);
+  virtual void setValue(::java::lang::Object *);
+  virtual void setWantsInput(jboolean);
+  static jint showConfirmDialog(::java::awt::Component *, ::java::lang::Object *);
+  static jint showConfirmDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint);
+  static jint showConfirmDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint, jint);
+  static jint showConfirmDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint, jint, ::javax::swing::Icon *);
+  static ::java::lang::String * showInputDialog(::java::awt::Component *, ::java::lang::Object *);
+  static ::java::lang::String * showInputDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::Object *);
+  static ::java::lang::String * showInputDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint);
+  static ::java::lang::Object * showInputDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint, ::javax::swing::Icon *, JArray< ::java::lang::Object * > *, ::java::lang::Object *);
+  static ::java::lang::String * showInputDialog(::java::lang::Object *);
+  static ::java::lang::String * showInputDialog(::java::lang::Object *, ::java::lang::Object *);
+  static jint showInternalConfirmDialog(::java::awt::Component *, ::java::lang::Object *);
+  static jint showInternalConfirmDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint);
+  static jint showInternalConfirmDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint, jint);
+  static jint showInternalConfirmDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint, jint, ::javax::swing::Icon *);
+  static ::java::lang::String * showInternalInputDialog(::java::awt::Component *, ::java::lang::Object *);
+  static ::java::lang::String * showInternalInputDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint);
+  static ::java::lang::Object * showInternalInputDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint, ::javax::swing::Icon *, JArray< ::java::lang::Object * > *, ::java::lang::Object *);
+  static void showInternalMessageDialog(::java::awt::Component *, ::java::lang::Object *);
+  static void showInternalMessageDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint);
+  static void showInternalMessageDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint, ::javax::swing::Icon *);
+  static jint showInternalOptionDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint, jint, ::javax::swing::Icon *, JArray< ::java::lang::Object * > *, ::java::lang::Object *);
+  static void showMessageDialog(::java::awt::Component *, ::java::lang::Object *);
+  static void showMessageDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint);
+  static void showMessageDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint, ::javax::swing::Icon *);
+  static jint showOptionDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint, jint, ::javax::swing::Icon *, JArray< ::java::lang::Object * > *, ::java::lang::Object *);
+  virtual void updateUI();
+private:
+  jboolean validMessageType(jint);
+  jboolean validOptionType(jint);
+  static void startModal(::javax::swing::JInternalFrame *);
+  static const jlong serialVersionUID = 5231143276678566796LL;
+public:
+  static const jint CANCEL_OPTION = 2;
+  static const jint CLOSED_OPTION = -1;
+  static const jint DEFAULT_OPTION = -1;
+  static const jint NO_OPTION = 1;
+  static const jint OK_CANCEL_OPTION = 2;
+  static const jint OK_OPTION = 0;
+  static const jint YES_NO_CANCEL_OPTION = 1;
+  static const jint YES_NO_OPTION = 0;
+  static const jint YES_OPTION = 0;
+  static const jint ERROR_MESSAGE = 0;
+  static const jint INFORMATION_MESSAGE = 1;
+  static const jint PLAIN_MESSAGE = -1;
+  static const jint QUESTION_MESSAGE = 3;
+  static const jint WARNING_MESSAGE = 2;
+  static ::java::lang::String * ICON_PROPERTY;
+  static ::java::lang::String * INITIAL_SELECTION_VALUE_PROPERTY;
+  static ::java::lang::String * INITIAL_VALUE_PROPERTY;
+  static ::java::lang::String * INPUT_VALUE_PROPERTY;
+  static ::java::lang::String * MESSAGE_PROPERTY;
+  static ::java::lang::String * MESSAGE_TYPE_PROPERTY;
+  static ::java::lang::String * OPTION_TYPE_PROPERTY;
+  static ::java::lang::String * OPTIONS_PROPERTY;
+  static ::java::lang::String * SELECTION_VALUES_PROPERTY;
+  static ::java::lang::String * VALUE_PROPERTY;
+  static ::java::lang::String * WANTS_INPUT_PROPERTY;
+  static ::java::lang::Object * UNINITIALIZED_VALUE;
+public: // actually protected
+  ::javax::swing::Icon * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) icon;
+  ::java::lang::Object * initialSelectionValue;
+  ::java::lang::Object * initialValue;
+  ::java::lang::Object * inputValue;
+  ::java::lang::Object * message;
+  jint messageType;
+  JArray< ::java::lang::Object * > * options;
+  jint optionType;
+  JArray< ::java::lang::Object * > * selectionValues;
+  ::java::lang::Object * value;
+  jboolean wantsInput;
+private:
+  static ::java::awt::Frame * privFrame;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JOptionPane__
diff --git a/libjava/javax/swing/JPanel$AccessibleJPanel.h b/libjava/javax/swing/JPanel$AccessibleJPanel.h
new file mode 100644
index 000000000..c4f9878ae
--- /dev/null
+++ b/libjava/javax/swing/JPanel$AccessibleJPanel.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JPanel$AccessibleJPanel__
+#define __javax_swing_JPanel$AccessibleJPanel__
+
+#pragma interface
+
+#include <javax/swing/JComponent$AccessibleJComponent.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleRole;
+    }
+    namespace swing
+    {
+        class JPanel;
+        class JPanel$AccessibleJPanel;
+    }
+  }
+}
+
+class javax::swing::JPanel$AccessibleJPanel : public ::javax::swing::JComponent$AccessibleJComponent
+{
+
+public: // actually protected
+  JPanel$AccessibleJPanel(::javax::swing::JPanel *);
+public:
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+public: // actually package-private
+  ::javax::swing::JPanel * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JPanel$AccessibleJPanel__
diff --git a/libjava/javax/swing/JPanel.h b/libjava/javax/swing/JPanel.h
new file mode 100644
index 000000000..8270c8307
--- /dev/null
+++ b/libjava/javax/swing/JPanel.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JPanel__
+#define __javax_swing_JPanel__
+
+#pragma interface
+
+#include <javax/swing/JComponent.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class LayoutManager;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class JPanel;
+      namespace plaf
+      {
+          class PanelUI;
+      }
+    }
+  }
+}
+
+class javax::swing::JPanel : public ::javax::swing::JComponent
+{
+
+public:
+  JPanel();
+  JPanel(jboolean);
+  JPanel(::java::awt::LayoutManager *);
+  JPanel(::java::awt::LayoutManager *, jboolean);
+  virtual ::java::lang::String * getUIClassID();
+  virtual void setUI(::javax::swing::plaf::PanelUI *);
+  virtual ::javax::swing::plaf::PanelUI * getUI();
+  virtual void updateUI();
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+public: // actually protected
+  virtual ::java::lang::String * paramString();
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JPanel__
diff --git a/libjava/javax/swing/JPasswordField$AccessibleJPasswordField.h b/libjava/javax/swing/JPasswordField$AccessibleJPasswordField.h
new file mode 100644
index 000000000..901558e1e
--- /dev/null
+++ b/libjava/javax/swing/JPasswordField$AccessibleJPasswordField.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JPasswordField$AccessibleJPasswordField__
+#define __javax_swing_JPasswordField$AccessibleJPasswordField__
+
+#pragma interface
+
+#include <javax/swing/JTextField$AccessibleJTextField.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleRole;
+    }
+    namespace swing
+    {
+        class JPasswordField;
+        class JPasswordField$AccessibleJPasswordField;
+    }
+  }
+}
+
+class javax::swing::JPasswordField$AccessibleJPasswordField : public ::javax::swing::JTextField$AccessibleJTextField
+{
+
+public: // actually protected
+  JPasswordField$AccessibleJPasswordField(::javax::swing::JPasswordField *);
+public:
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+private:
+  static const jlong serialVersionUID = -8477039424200681086LL;
+public: // actually package-private
+  ::javax::swing::JPasswordField * __attribute__((aligned(__alignof__( ::javax::swing::JTextField$AccessibleJTextField)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JPasswordField$AccessibleJPasswordField__
diff --git a/libjava/javax/swing/JPasswordField.h b/libjava/javax/swing/JPasswordField.h
new file mode 100644
index 000000000..7e9a8259c
--- /dev/null
+++ b/libjava/javax/swing/JPasswordField.h
@@ -0,0 +1,62 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JPasswordField__
+#define __javax_swing_JPasswordField__
+
+#pragma interface
+
+#include <javax/swing/JTextField.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class JPasswordField;
+      namespace text
+      {
+          class Document;
+      }
+    }
+  }
+}
+
+class javax::swing::JPasswordField : public ::javax::swing::JTextField
+{
+
+public:
+  JPasswordField();
+  JPasswordField(::java::lang::String *);
+  JPasswordField(jint);
+  JPasswordField(::java::lang::String *, jint);
+  JPasswordField(::javax::swing::text::Document *, ::java::lang::String *, jint);
+private:
+  void writeObject(::java::io::ObjectOutputStream *);
+public:
+  virtual ::java::lang::String * getUIClassID();
+  virtual jchar getEchoChar();
+  virtual void setEchoChar(jchar);
+  virtual jboolean echoCharIsSet();
+  virtual void copy();
+  virtual void cut();
+  virtual ::java::lang::String * getText();
+  virtual ::java::lang::String * getText(jint, jint);
+  virtual JArray< jchar > * getPassword();
+public: // actually protected
+  virtual ::java::lang::String * paramString();
+public:
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+private:
+  jchar __attribute__((aligned(__alignof__( ::javax::swing::JTextField)))) echoChar;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JPasswordField__
diff --git a/libjava/javax/swing/JPopupMenu$1.h b/libjava/javax/swing/JPopupMenu$1.h
new file mode 100644
index 000000000..81719f00e
--- /dev/null
+++ b/libjava/javax/swing/JPopupMenu$1.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JPopupMenu$1__
+#define __javax_swing_JPopupMenu$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JPopupMenu;
+        class JPopupMenu$1;
+    }
+  }
+}
+
+class javax::swing::JPopupMenu$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  JPopupMenu$1(::javax::swing::JPopupMenu *);
+public:
+  virtual void run();
+public: // actually package-private
+  ::javax::swing::JPopupMenu * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JPopupMenu$1__
diff --git a/libjava/javax/swing/JPopupMenu$2.h b/libjava/javax/swing/JPopupMenu$2.h
new file mode 100644
index 000000000..d8b116b99
--- /dev/null
+++ b/libjava/javax/swing/JPopupMenu$2.h
@@ -0,0 +1,37 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JPopupMenu$2__
+#define __javax_swing_JPopupMenu$2__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JPopupMenu;
+        class JPopupMenu$2;
+    }
+  }
+}
+
+class javax::swing::JPopupMenu$2 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  JPopupMenu$2(::javax::swing::JPopupMenu *, jboolean);
+public:
+  virtual void run();
+public: // actually package-private
+  ::javax::swing::JPopupMenu * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+private:
+  jboolean val$visible;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JPopupMenu$2__
diff --git a/libjava/javax/swing/JPopupMenu$AccessibleJPopupMenu.h b/libjava/javax/swing/JPopupMenu$AccessibleJPopupMenu.h
new file mode 100644
index 000000000..d3ace0c63
--- /dev/null
+++ b/libjava/javax/swing/JPopupMenu$AccessibleJPopupMenu.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JPopupMenu$AccessibleJPopupMenu__
+#define __javax_swing_JPopupMenu$AccessibleJPopupMenu__
+
+#pragma interface
+
+#include <javax/swing/JComponent$AccessibleJComponent.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleRole;
+    }
+    namespace swing
+    {
+        class JPopupMenu;
+        class JPopupMenu$AccessibleJPopupMenu;
+    }
+  }
+}
+
+class javax::swing::JPopupMenu$AccessibleJPopupMenu : public ::javax::swing::JComponent$AccessibleJComponent
+{
+
+public: // actually protected
+  JPopupMenu$AccessibleJPopupMenu(::javax::swing::JPopupMenu *);
+public:
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+private:
+  static const jlong serialVersionUID = 7423261328879849768LL;
+public: // actually package-private
+  ::javax::swing::JPopupMenu * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JPopupMenu$AccessibleJPopupMenu__
diff --git a/libjava/javax/swing/JPopupMenu$ActionChangeListener.h b/libjava/javax/swing/JPopupMenu$ActionChangeListener.h
new file mode 100644
index 000000000..4c2385e45
--- /dev/null
+++ b/libjava/javax/swing/JPopupMenu$ActionChangeListener.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JPopupMenu$ActionChangeListener__
+#define __javax_swing_JPopupMenu$ActionChangeListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JPopupMenu;
+        class JPopupMenu$ActionChangeListener;
+    }
+  }
+}
+
+class javax::swing::JPopupMenu$ActionChangeListener : public ::java::lang::Object
+{
+
+  JPopupMenu$ActionChangeListener(::javax::swing::JPopupMenu *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  JPopupMenu$ActionChangeListener(::javax::swing::JPopupMenu *, ::javax::swing::JPopupMenu$ActionChangeListener *);
+  ::javax::swing::JPopupMenu * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JPopupMenu$ActionChangeListener__
diff --git a/libjava/javax/swing/JPopupMenu$Separator.h b/libjava/javax/swing/JPopupMenu$Separator.h
new file mode 100644
index 000000000..e41bdedd6
--- /dev/null
+++ b/libjava/javax/swing/JPopupMenu$Separator.h
@@ -0,0 +1,30 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JPopupMenu$Separator__
+#define __javax_swing_JPopupMenu$Separator__
+
+#pragma interface
+
+#include <javax/swing/JSeparator.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JPopupMenu$Separator;
+    }
+  }
+}
+
+class javax::swing::JPopupMenu$Separator : public ::javax::swing::JSeparator
+{
+
+public:
+  JPopupMenu$Separator();
+  virtual ::java::lang::String * getUIClassID();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JPopupMenu$Separator__
diff --git a/libjava/javax/swing/JPopupMenu.h b/libjava/javax/swing/JPopupMenu.h
new file mode 100644
index 000000000..44bbc89bd
--- /dev/null
+++ b/libjava/javax/swing/JPopupMenu.h
@@ -0,0 +1,148 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JPopupMenu__
+#define __javax_swing_JPopupMenu__
+
+#pragma interface
+
+#include <javax/swing/JComponent.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Dimension;
+        class Insets;
+      namespace event
+      {
+          class KeyEvent;
+          class MouseEvent;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class Action;
+        class JMenuItem;
+        class JPopupMenu;
+        class MenuElement;
+        class MenuSelectionManager;
+        class Popup;
+        class SingleSelectionModel;
+      namespace event
+      {
+          class MenuKeyListener;
+          class PopupMenuListener;
+      }
+      namespace plaf
+      {
+          class PopupMenuUI;
+      }
+    }
+  }
+}
+
+class javax::swing::JPopupMenu : public ::javax::swing::JComponent
+{
+
+public:
+  JPopupMenu();
+  JPopupMenu(::java::lang::String *);
+  virtual ::javax::swing::JMenuItem * add(::javax::swing::JMenuItem *);
+  virtual ::javax::swing::JMenuItem * add(::java::lang::String *);
+  virtual ::javax::swing::JMenuItem * add(::javax::swing::Action *);
+  virtual void remove(jint);
+  virtual void insert(::javax::swing::Action *, jint);
+  virtual void insert(::java::awt::Component *, jint);
+  static jboolean getDefaultLightWeightPopupEnabled();
+  static void setDefaultLightWeightPopupEnabled(jboolean);
+  virtual ::javax::swing::plaf::PopupMenuUI * getUI();
+  virtual void setUI(::javax::swing::plaf::PopupMenuUI *);
+  virtual void updateUI();
+  virtual ::java::lang::String * getUIClassID();
+  virtual ::javax::swing::SingleSelectionModel * getSelectionModel();
+  virtual void setSelectionModel(::javax::swing::SingleSelectionModel *);
+public: // actually protected
+  virtual ::javax::swing::JMenuItem * createActionComponent(::javax::swing::Action *);
+  virtual ::java::beans::PropertyChangeListener * createActionChangeListener(::javax::swing::JMenuItem *);
+public:
+  virtual jboolean isLightWeightPopupEnabled();
+  virtual void setLightWeightPopupEnabled(jboolean);
+  virtual ::java::lang::String * getLabel();
+  virtual void setLabel(::java::lang::String *);
+  virtual void addSeparator();
+  virtual void addMenuKeyListener(::javax::swing::event::MenuKeyListener *);
+  virtual void removeMenuKeyListener(::javax::swing::event::MenuKeyListener *);
+  virtual JArray< ::javax::swing::event::MenuKeyListener * > * getMenuKeyListeners();
+  virtual void addPopupMenuListener(::javax::swing::event::PopupMenuListener *);
+  virtual void removePopupMenuListener(::javax::swing::event::PopupMenuListener *);
+  virtual JArray< ::javax::swing::event::PopupMenuListener * > * getPopupMenuListeners();
+public: // actually protected
+  virtual void firePopupMenuWillBecomeVisible();
+  virtual void firePopupMenuWillBecomeInvisible();
+  virtual void firePopupMenuCanceled();
+public:
+  virtual void pack();
+  virtual jboolean isVisible();
+  virtual void setVisible(jboolean);
+  virtual void setLocation(jint, jint);
+  virtual ::java::awt::Component * getInvoker();
+  virtual void setInvoker(::java::awt::Component *);
+  virtual void show(::java::awt::Component *, jint, jint);
+  virtual ::java::awt::Component * getComponentAtIndex(jint);
+  virtual jint getComponentIndex(::java::awt::Component *);
+  virtual void setPopupSize(::java::awt::Dimension *);
+  virtual void setPopupSize(jint, jint);
+  virtual void setSelected(::java::awt::Component *);
+  virtual jboolean isBorderPainted();
+  virtual void setBorderPainted(jboolean);
+  virtual ::java::awt::Insets * getMargin();
+public: // actually protected
+  virtual ::java::lang::String * paramString();
+public:
+  virtual void processMouseEvent(::java::awt::event::MouseEvent *, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *);
+  virtual void processKeyEvent(::java::awt::event::KeyEvent *, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *);
+  virtual void menuSelectionChanged(jboolean);
+  virtual JArray< ::javax::swing::MenuElement * > * getSubElements();
+  virtual ::java::awt::Component * getComponent();
+  virtual jboolean isPopupTrigger(::java::awt::event::MouseEvent *);
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+public: // actually package-private
+  virtual jboolean onTop();
+private:
+  static const jlong serialVersionUID = -8336996630009646009LL;
+  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) borderPainted;
+  static jboolean DefaultLightWeightPopupEnabled;
+public: // actually package-private
+  ::java::awt::Component * invoker;
+private:
+  ::java::lang::String * label;
+  ::java::awt::Insets * margin;
+  jboolean lightWeightPopupEnabled;
+public: // actually protected
+  ::javax::swing::SingleSelectionModel * selectionModel;
+private:
+  ::javax::swing::Popup * popup;
+  jint popupLocationX;
+  jint popupLocationY;
+  jboolean visible;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JPopupMenu__
diff --git a/libjava/javax/swing/JProgressBar$1.h b/libjava/javax/swing/JProgressBar$1.h
new file mode 100644
index 000000000..2c11387e9
--- /dev/null
+++ b/libjava/javax/swing/JProgressBar$1.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JProgressBar$1__
+#define __javax_swing_JProgressBar$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JProgressBar;
+        class JProgressBar$1;
+      namespace event
+      {
+          class ChangeEvent;
+      }
+    }
+  }
+}
+
+class javax::swing::JProgressBar$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  JProgressBar$1(::javax::swing::JProgressBar *);
+public:
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+public: // actually package-private
+  ::javax::swing::JProgressBar * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JProgressBar$1__
diff --git a/libjava/javax/swing/JProgressBar$AccessibleJProgressBar.h b/libjava/javax/swing/JProgressBar$AccessibleJProgressBar.h
new file mode 100644
index 000000000..b5b701635
--- /dev/null
+++ b/libjava/javax/swing/JProgressBar$AccessibleJProgressBar.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JProgressBar$AccessibleJProgressBar__
+#define __javax_swing_JProgressBar$AccessibleJProgressBar__
+
+#pragma interface
+
+#include <javax/swing/JComponent$AccessibleJComponent.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleRole;
+        class AccessibleStateSet;
+        class AccessibleValue;
+    }
+    namespace swing
+    {
+        class JProgressBar;
+        class JProgressBar$AccessibleJProgressBar;
+    }
+  }
+}
+
+class javax::swing::JProgressBar$AccessibleJProgressBar : public ::javax::swing::JComponent$AccessibleJComponent
+{
+
+public: // actually protected
+  JProgressBar$AccessibleJProgressBar(::javax::swing::JProgressBar *);
+public:
+  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+  virtual ::javax::accessibility::AccessibleValue * getAccessibleValue();
+  virtual ::java::lang::Number * getCurrentAccessibleValue();
+  virtual jboolean setCurrentAccessibleValue(::java::lang::Number *);
+  virtual ::java::lang::Number * getMinimumAccessibleValue();
+  virtual ::java::lang::Number * getMaximumAccessibleValue();
+private:
+  static const jlong serialVersionUID = -2938130009392721813LL;
+public: // actually package-private
+  ::javax::swing::JProgressBar * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JProgressBar$AccessibleJProgressBar__
diff --git a/libjava/javax/swing/JProgressBar.h b/libjava/javax/swing/JProgressBar.h
new file mode 100644
index 000000000..459af9ad5
--- /dev/null
+++ b/libjava/javax/swing/JProgressBar.h
@@ -0,0 +1,107 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JProgressBar__
+#define __javax_swing_JProgressBar__
+
+#pragma interface
+
+#include <javax/swing/JComponent.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class BoundedRangeModel;
+        class JProgressBar;
+      namespace event
+      {
+          class ChangeEvent;
+          class ChangeListener;
+      }
+      namespace plaf
+      {
+          class ProgressBarUI;
+      }
+    }
+  }
+}
+
+class javax::swing::JProgressBar : public ::javax::swing::JComponent
+{
+
+public:
+  JProgressBar();
+  JProgressBar(jint);
+  JProgressBar(jint, jint);
+  JProgressBar(jint, jint, jint);
+  JProgressBar(::javax::swing::BoundedRangeModel *);
+  virtual jint getValue();
+  virtual void setValue(jint);
+public: // actually protected
+  virtual void paintBorder(::java::awt::Graphics *);
+public:
+  virtual jint getOrientation();
+  virtual void setOrientation(jint);
+  virtual jboolean isStringPainted();
+  virtual void setStringPainted(jboolean);
+  virtual ::java::lang::String * getString();
+  virtual void setString(::java::lang::String *);
+  virtual jdouble getPercentComplete();
+  virtual jboolean isBorderPainted();
+  virtual void setBorderPainted(jboolean);
+  virtual ::javax::swing::plaf::ProgressBarUI * getUI();
+  virtual void setUI(::javax::swing::plaf::ProgressBarUI *);
+  virtual void updateUI();
+  virtual ::java::lang::String * getUIClassID();
+public: // actually protected
+  virtual ::javax::swing::event::ChangeListener * createChangeListener();
+public:
+  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
+  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
+  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
+public: // actually protected
+  virtual void fireStateChanged();
+public:
+  virtual ::javax::swing::BoundedRangeModel * getModel();
+  virtual void setModel(::javax::swing::BoundedRangeModel *);
+  virtual jint getMinimum();
+  virtual void setMinimum(jint);
+  virtual jint getMaximum();
+  virtual void setMaximum(jint);
+public: // actually protected
+  virtual ::java::lang::String * paramString();
+public:
+  virtual void setIndeterminate(jboolean);
+  virtual jboolean isIndeterminate();
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+private:
+  static const jlong serialVersionUID = 1980046021813598781LL;
+  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) indeterminate;
+public: // actually protected
+  jint orientation;
+  jboolean paintBorder__;
+  ::javax::swing::BoundedRangeModel * model;
+  ::java::lang::String * progressString;
+  jboolean paintString;
+  ::javax::swing::event::ChangeEvent * changeEvent;
+  ::javax::swing::event::ChangeListener * changeListener;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JProgressBar__
diff --git a/libjava/javax/swing/JRadioButton$AccessibleJRadioButton.h b/libjava/javax/swing/JRadioButton$AccessibleJRadioButton.h
new file mode 100644
index 000000000..9dc147a8b
--- /dev/null
+++ b/libjava/javax/swing/JRadioButton$AccessibleJRadioButton.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JRadioButton$AccessibleJRadioButton__
+#define __javax_swing_JRadioButton$AccessibleJRadioButton__
+
+#pragma interface
+
+#include <javax/swing/JToggleButton$AccessibleJToggleButton.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleRole;
+    }
+    namespace swing
+    {
+        class JRadioButton;
+        class JRadioButton$AccessibleJRadioButton;
+    }
+  }
+}
+
+class javax::swing::JRadioButton$AccessibleJRadioButton : public ::javax::swing::JToggleButton$AccessibleJToggleButton
+{
+
+public: // actually protected
+  JRadioButton$AccessibleJRadioButton(::javax::swing::JRadioButton *);
+public:
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+private:
+  static const jlong serialVersionUID = 4850967637026120674LL;
+public: // actually package-private
+  ::javax::swing::JRadioButton * __attribute__((aligned(__alignof__( ::javax::swing::JToggleButton$AccessibleJToggleButton)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JRadioButton$AccessibleJRadioButton__
diff --git a/libjava/javax/swing/JRadioButton.h b/libjava/javax/swing/JRadioButton.h
new file mode 100644
index 000000000..7c8bd4f69
--- /dev/null
+++ b/libjava/javax/swing/JRadioButton.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JRadioButton__
+#define __javax_swing_JRadioButton__
+
+#pragma interface
+
+#include <javax/swing/JToggleButton.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class Action;
+        class Icon;
+        class JRadioButton;
+    }
+  }
+}
+
+class javax::swing::JRadioButton : public ::javax::swing::JToggleButton
+{
+
+public:
+  JRadioButton();
+  JRadioButton(::javax::swing::Action *);
+  JRadioButton(::javax::swing::Icon *);
+  JRadioButton(::javax::swing::Icon *, jboolean);
+  JRadioButton(::java::lang::String *);
+  JRadioButton(::java::lang::String *, jboolean);
+  JRadioButton(::java::lang::String *, ::javax::swing::Icon *);
+  JRadioButton(::java::lang::String *, ::javax::swing::Icon *, jboolean);
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+  virtual ::java::lang::String * getUIClassID();
+public: // actually protected
+  virtual ::java::lang::String * paramString();
+public:
+  virtual void updateUI();
+private:
+  static const jlong serialVersionUID = 7751949583255506856LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JRadioButton__
diff --git a/libjava/javax/swing/JRadioButtonMenuItem$AccessibleJRadioButtonMenuItem.h b/libjava/javax/swing/JRadioButtonMenuItem$AccessibleJRadioButtonMenuItem.h
new file mode 100644
index 000000000..7ef610cfc
--- /dev/null
+++ b/libjava/javax/swing/JRadioButtonMenuItem$AccessibleJRadioButtonMenuItem.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JRadioButtonMenuItem$AccessibleJRadioButtonMenuItem__
+#define __javax_swing_JRadioButtonMenuItem$AccessibleJRadioButtonMenuItem__
+
+#pragma interface
+
+#include <javax/swing/JMenuItem$AccessibleJMenuItem.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleRole;
+    }
+    namespace swing
+    {
+        class JRadioButtonMenuItem;
+        class JRadioButtonMenuItem$AccessibleJRadioButtonMenuItem;
+    }
+  }
+}
+
+class javax::swing::JRadioButtonMenuItem$AccessibleJRadioButtonMenuItem : public ::javax::swing::JMenuItem$AccessibleJMenuItem
+{
+
+public: // actually protected
+  JRadioButtonMenuItem$AccessibleJRadioButtonMenuItem(::javax::swing::JRadioButtonMenuItem *);
+public:
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+private:
+  static const jlong serialVersionUID = 4381471510145292179LL;
+public: // actually package-private
+  ::javax::swing::JRadioButtonMenuItem * __attribute__((aligned(__alignof__( ::javax::swing::JMenuItem$AccessibleJMenuItem)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JRadioButtonMenuItem$AccessibleJRadioButtonMenuItem__
diff --git a/libjava/javax/swing/JRadioButtonMenuItem.h b/libjava/javax/swing/JRadioButtonMenuItem.h
new file mode 100644
index 000000000..4c982cff9
--- /dev/null
+++ b/libjava/javax/swing/JRadioButtonMenuItem.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JRadioButtonMenuItem__
+#define __javax_swing_JRadioButtonMenuItem__
+
+#pragma interface
+
+#include <javax/swing/JMenuItem.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class Action;
+        class Icon;
+        class JRadioButtonMenuItem;
+    }
+  }
+}
+
+class javax::swing::JRadioButtonMenuItem : public ::javax::swing::JMenuItem
+{
+
+public:
+  JRadioButtonMenuItem();
+  JRadioButtonMenuItem(::javax::swing::Icon *);
+  JRadioButtonMenuItem(::java::lang::String *);
+  JRadioButtonMenuItem(::javax::swing::Action *);
+  JRadioButtonMenuItem(::java::lang::String *, ::javax::swing::Icon *);
+  JRadioButtonMenuItem(::java::lang::String *, jboolean);
+  JRadioButtonMenuItem(::javax::swing::Icon *, jboolean);
+  JRadioButtonMenuItem(::java::lang::String *, ::javax::swing::Icon *, jboolean);
+  virtual ::java::lang::String * getUIClassID();
+  virtual void requestFocus();
+public: // actually protected
+  virtual ::java::lang::String * paramString();
+public:
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+private:
+  static const jlong serialVersionUID = 8482658191548521743LL;
+  static ::java::lang::String * uiClassID;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JRadioButtonMenuItem__
diff --git a/libjava/javax/swing/JRootPane$AccessibleJRootPane.h b/libjava/javax/swing/JRootPane$AccessibleJRootPane.h
new file mode 100644
index 000000000..a527b57d2
--- /dev/null
+++ b/libjava/javax/swing/JRootPane$AccessibleJRootPane.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JRootPane$AccessibleJRootPane__
+#define __javax_swing_JRootPane$AccessibleJRootPane__
+
+#pragma interface
+
+#include <javax/swing/JComponent$AccessibleJComponent.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleRole;
+    }
+    namespace swing
+    {
+        class JRootPane;
+        class JRootPane$AccessibleJRootPane;
+    }
+  }
+}
+
+class javax::swing::JRootPane$AccessibleJRootPane : public ::javax::swing::JComponent$AccessibleJComponent
+{
+
+public: // actually protected
+  JRootPane$AccessibleJRootPane(::javax::swing::JRootPane *);
+public:
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+private:
+  static const jlong serialVersionUID = 1082432482784468088LL;
+public: // actually package-private
+  ::javax::swing::JRootPane * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JRootPane$AccessibleJRootPane__
diff --git a/libjava/javax/swing/JRootPane$RootLayout.h b/libjava/javax/swing/JRootPane$RootLayout.h
new file mode 100644
index 000000000..22967dea0
--- /dev/null
+++ b/libjava/javax/swing/JRootPane$RootLayout.h
@@ -0,0 +1,60 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JRootPane$RootLayout__
+#define __javax_swing_JRootPane$RootLayout__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JRootPane;
+        class JRootPane$RootLayout;
+    }
+  }
+}
+
+class javax::swing::JRootPane$RootLayout : public ::java::lang::Object
+{
+
+public: // actually protected
+  JRootPane$RootLayout(::javax::swing::JRootPane *);
+public:
+  virtual void addLayoutComponent(::java::awt::Component *, ::java::lang::Object *);
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+  virtual jfloat getLayoutAlignmentX(::java::awt::Container *);
+  virtual jfloat getLayoutAlignmentY(::java::awt::Container *);
+  virtual void invalidateLayout(::java::awt::Container *);
+  virtual void layoutContainer(::java::awt::Container *);
+  virtual ::java::awt::Dimension * maximumLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  virtual void removeLayoutComponent(::java::awt::Component *);
+private:
+  static const jlong serialVersionUID = -4100116998559815027LL;
+  ::java::awt::Rectangle * __attribute__((aligned(__alignof__( ::java::lang::Object)))) glassPaneBounds;
+  ::java::awt::Rectangle * layeredPaneBounds;
+  ::java::awt::Rectangle * contentPaneBounds;
+  ::java::awt::Rectangle * menuBarBounds;
+public: // actually package-private
+  ::javax::swing::JRootPane * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JRootPane$RootLayout__
diff --git a/libjava/javax/swing/JRootPane.h b/libjava/javax/swing/JRootPane.h
new file mode 100644
index 000000000..7d415773f
--- /dev/null
+++ b/libjava/javax/swing/JRootPane.h
@@ -0,0 +1,103 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JRootPane__
+#define __javax_swing_JRootPane__
+
+#pragma interface
+
+#include <javax/swing/JComponent.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class LayoutManager;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class Action;
+        class JButton;
+        class JLayeredPane;
+        class JMenuBar;
+        class JRootPane;
+      namespace plaf
+      {
+          class RootPaneUI;
+      }
+    }
+  }
+}
+
+class javax::swing::JRootPane : public ::javax::swing::JComponent
+{
+
+public:
+  virtual void setJMenuBar(::javax::swing::JMenuBar *);
+  virtual void setMenuBar(::javax::swing::JMenuBar *);
+  virtual ::javax::swing::JMenuBar * getJMenuBar();
+  virtual ::javax::swing::JMenuBar * getMenuBar();
+  virtual jboolean isValidateRoot();
+  virtual ::java::awt::Container * getContentPane();
+  virtual void setContentPane(::java::awt::Container *);
+public: // actually protected
+  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
+public:
+  virtual ::java::awt::Component * getGlassPane();
+  virtual void setGlassPane(::java::awt::Component *);
+  virtual ::javax::swing::JLayeredPane * getLayeredPane();
+  virtual void setLayeredPane(::javax::swing::JLayeredPane *);
+  JRootPane();
+public: // actually protected
+  virtual ::java::awt::LayoutManager * createRootLayout();
+  virtual ::java::awt::Container * createContentPane();
+  virtual ::java::awt::Component * createGlassPane();
+  virtual ::javax::swing::JLayeredPane * createLayeredPane();
+public:
+  virtual ::javax::swing::plaf::RootPaneUI * getUI();
+  virtual void setUI(::javax::swing::plaf::RootPaneUI *);
+  virtual void updateUI();
+  virtual ::java::lang::String * getUIClassID();
+  virtual ::javax::swing::JButton * getDefaultButton();
+  virtual void setDefaultButton(::javax::swing::JButton *);
+  virtual jint getWindowDecorationStyle();
+  virtual void setWindowDecorationStyle(jint);
+  virtual jboolean isOptimizedDrawingEnable();
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+private:
+  static const jlong serialVersionUID = 8690748000348575668LL;
+public:
+  static const jint NONE = 0;
+  static const jint FRAME = 1;
+  static const jint PLAIN_DIALOG = 2;
+  static const jint INFORMATION_DIALOG = 3;
+  static const jint ERROR_DIALOG = 4;
+  static const jint COLOR_CHOOSER_DIALOG = 5;
+  static const jint FILE_CHOOSER_DIALOG = 6;
+  static const jint QUESTION_DIALOG = 7;
+  static const jint WARNING_DIALOG = 8;
+public: // actually protected
+  ::java::awt::Component * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) glassPane;
+  ::javax::swing::JLayeredPane * layeredPane;
+  ::javax::swing::JMenuBar * menuBar;
+  ::java::awt::Container * contentPane;
+  ::javax::swing::JButton * defaultButton;
+  ::javax::swing::Action * defaultPressAction;
+  ::javax::swing::Action * defaultReleaseAction;
+private:
+  jint windowDecorationStyle;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JRootPane__
diff --git a/libjava/javax/swing/JScrollBar$AccessibleJScrollBar.h b/libjava/javax/swing/JScrollBar$AccessibleJScrollBar.h
new file mode 100644
index 000000000..1e57461a7
--- /dev/null
+++ b/libjava/javax/swing/JScrollBar$AccessibleJScrollBar.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JScrollBar$AccessibleJScrollBar__
+#define __javax_swing_JScrollBar$AccessibleJScrollBar__
+
+#pragma interface
+
+#include <javax/swing/JComponent$AccessibleJComponent.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleRole;
+        class AccessibleStateSet;
+        class AccessibleValue;
+    }
+    namespace swing
+    {
+        class JScrollBar;
+        class JScrollBar$AccessibleJScrollBar;
+    }
+  }
+}
+
+class javax::swing::JScrollBar$AccessibleJScrollBar : public ::javax::swing::JComponent$AccessibleJComponent
+{
+
+public: // actually protected
+  JScrollBar$AccessibleJScrollBar(::javax::swing::JScrollBar *);
+public:
+  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+  virtual ::javax::accessibility::AccessibleValue * getAccessibleValue();
+  virtual ::java::lang::Number * getCurrentAccessibleValue();
+  virtual jboolean setCurrentAccessibleValue(::java::lang::Number *);
+  virtual ::java::lang::Number * getMinimumAccessibleValue();
+  virtual ::java::lang::Number * getMaximumAccessibleValue();
+private:
+  static const jlong serialVersionUID = -7758162392045586663LL;
+public: // actually package-private
+  ::javax::swing::JScrollBar * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JScrollBar$AccessibleJScrollBar__
diff --git a/libjava/javax/swing/JScrollBar$ScrollBarChangeListener.h b/libjava/javax/swing/JScrollBar$ScrollBarChangeListener.h
new file mode 100644
index 000000000..9ac76b23a
--- /dev/null
+++ b/libjava/javax/swing/JScrollBar$ScrollBarChangeListener.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JScrollBar$ScrollBarChangeListener__
+#define __javax_swing_JScrollBar$ScrollBarChangeListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JScrollBar;
+        class JScrollBar$ScrollBarChangeListener;
+      namespace event
+      {
+          class ChangeEvent;
+      }
+    }
+  }
+}
+
+class javax::swing::JScrollBar$ScrollBarChangeListener : public ::java::lang::Object
+{
+
+  JScrollBar$ScrollBarChangeListener(::javax::swing::JScrollBar *);
+public:
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+public: // actually package-private
+  JScrollBar$ScrollBarChangeListener(::javax::swing::JScrollBar *, ::javax::swing::JScrollBar$ScrollBarChangeListener *);
+  ::javax::swing::JScrollBar * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JScrollBar$ScrollBarChangeListener__
diff --git a/libjava/javax/swing/JScrollBar.h b/libjava/javax/swing/JScrollBar.h
new file mode 100644
index 000000000..b72d2698c
--- /dev/null
+++ b/libjava/javax/swing/JScrollBar.h
@@ -0,0 +1,107 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JScrollBar__
+#define __javax_swing_JScrollBar__
+
+#pragma interface
+
+#include <javax/swing/JComponent.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+      namespace event
+      {
+          class AdjustmentListener;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class BoundedRangeModel;
+        class JScrollBar;
+      namespace event
+      {
+          class ChangeListener;
+      }
+      namespace plaf
+      {
+          class ScrollBarUI;
+      }
+    }
+  }
+}
+
+class javax::swing::JScrollBar : public ::javax::swing::JComponent
+{
+
+public:
+  JScrollBar();
+  JScrollBar(jint);
+  JScrollBar(jint, jint, jint, jint, jint);
+  virtual void setUI(::javax::swing::plaf::ScrollBarUI *);
+  virtual ::javax::swing::plaf::ScrollBarUI * getUI();
+  virtual void updateUI();
+  virtual ::java::lang::String * getUIClassID();
+  virtual jint getOrientation();
+  virtual void setOrientation(jint);
+  virtual ::javax::swing::BoundedRangeModel * getModel();
+  virtual void setModel(::javax::swing::BoundedRangeModel *);
+  virtual jint getUnitIncrement(jint);
+  virtual void setUnitIncrement(jint);
+  virtual jint getBlockIncrement(jint);
+  virtual void setBlockIncrement(jint);
+  virtual jint getUnitIncrement();
+  virtual jint getBlockIncrement();
+  virtual jint getValue();
+  virtual void setValue(jint);
+  virtual jint getVisibleAmount();
+  virtual void setVisibleAmount(jint);
+  virtual jint getMinimum();
+  virtual void setMinimum(jint);
+  virtual jint getMaximum();
+  virtual void setMaximum(jint);
+  virtual jboolean getValueIsAdjusting();
+  virtual void setValueIsAdjusting(jboolean);
+  virtual void setValues(jint, jint, jint, jint);
+  virtual void addAdjustmentListener(::java::awt::event::AdjustmentListener *);
+  virtual void removeAdjustmentListener(::java::awt::event::AdjustmentListener *);
+  virtual JArray< ::java::awt::event::AdjustmentListener * > * getAdjustmentListeners();
+public: // actually protected
+  virtual void fireAdjustmentValueChanged(jint, jint, jint);
+public: // actually package-private
+  virtual void fireAdjustmentValueChanged(jint, jint, jint, jboolean);
+public:
+  virtual ::java::awt::Dimension * getMinimumSize();
+  virtual ::java::awt::Dimension * getMaximumSize();
+  virtual void setEnabled(jboolean);
+public: // actually protected
+  virtual ::java::lang::String * paramString();
+public:
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+private:
+  static const jlong serialVersionUID = -8195169869225066566LL;
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) blockIncrement;
+  ::javax::swing::BoundedRangeModel * model;
+  jint orientation;
+  jint unitIncrement;
+private:
+  ::javax::swing::event::ChangeListener * sbChangeListener;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JScrollBar__
diff --git a/libjava/javax/swing/JScrollPane$AccessibleJScrollPane.h b/libjava/javax/swing/JScrollPane$AccessibleJScrollPane.h
new file mode 100644
index 000000000..4075f51a9
--- /dev/null
+++ b/libjava/javax/swing/JScrollPane$AccessibleJScrollPane.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JScrollPane$AccessibleJScrollPane__
+#define __javax_swing_JScrollPane$AccessibleJScrollPane__
+
+#pragma interface
+
+#include <javax/swing/JComponent$AccessibleJComponent.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JScrollPane;
+        class JScrollPane$AccessibleJScrollPane;
+        class JViewport;
+      namespace event
+      {
+          class ChangeEvent;
+      }
+    }
+  }
+}
+
+class javax::swing::JScrollPane$AccessibleJScrollPane : public ::javax::swing::JComponent$AccessibleJComponent
+{
+
+public:
+  JScrollPane$AccessibleJScrollPane(::javax::swing::JScrollPane *);
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+  virtual void resetViewPort();
+public: // actually protected
+  ::javax::swing::JViewport * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) viewPort;
+public: // actually package-private
+  ::javax::swing::JScrollPane * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JScrollPane$AccessibleJScrollPane__
diff --git a/libjava/javax/swing/JScrollPane$ScrollBar.h b/libjava/javax/swing/JScrollPane$ScrollBar.h
new file mode 100644
index 000000000..92ca958e9
--- /dev/null
+++ b/libjava/javax/swing/JScrollPane$ScrollBar.h
@@ -0,0 +1,37 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JScrollPane$ScrollBar__
+#define __javax_swing_JScrollPane$ScrollBar__
+
+#pragma interface
+
+#include <javax/swing/JScrollBar.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JScrollPane;
+        class JScrollPane$ScrollBar;
+    }
+  }
+}
+
+class javax::swing::JScrollPane$ScrollBar : public ::javax::swing::JScrollBar
+{
+
+public:
+  JScrollPane$ScrollBar(::javax::swing::JScrollPane *, jint);
+  virtual jint getBlockIncrement(jint);
+  virtual jint getUnitIncrement(jint);
+private:
+  static const jlong serialVersionUID = -42032395320987283LL;
+public: // actually package-private
+  ::javax::swing::JScrollPane * __attribute__((aligned(__alignof__( ::javax::swing::JScrollBar)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JScrollPane$ScrollBar__
diff --git a/libjava/javax/swing/JScrollPane.h b/libjava/javax/swing/JScrollPane.h
new file mode 100644
index 000000000..6cef5ac4f
--- /dev/null
+++ b/libjava/javax/swing/JScrollPane.h
@@ -0,0 +1,116 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JScrollPane__
+#define __javax_swing_JScrollPane__
+
+#pragma interface
+
+#include <javax/swing/JComponent.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class ComponentOrientation;
+        class LayoutManager;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class JScrollBar;
+        class JScrollPane;
+        class JViewport;
+      namespace border
+      {
+          class Border;
+      }
+      namespace plaf
+      {
+          class ScrollPaneUI;
+      }
+    }
+  }
+}
+
+class javax::swing::JScrollPane : public ::javax::swing::JComponent
+{
+
+public:
+  virtual ::javax::swing::JViewport * getColumnHeader();
+  virtual ::java::awt::Component * getCorner(::java::lang::String *);
+  virtual ::javax::swing::JScrollBar * getHorizontalScrollBar();
+  virtual jint getHorizontalScrollBarPolicy();
+  virtual ::javax::swing::JViewport * getRowHeader();
+  virtual ::javax::swing::JScrollBar * getVerticalScrollBar();
+  virtual jint getVerticalScrollBarPolicy();
+  virtual ::javax::swing::JViewport * getViewport();
+  virtual ::javax::swing::border::Border * getViewportBorder();
+  virtual ::java::awt::Rectangle * getViewportBorderBounds();
+  virtual jboolean isWheelScrollingEnabled();
+private:
+  void sync();
+  void removeNonNull(::java::awt::Component *);
+  void addNonNull(::java::awt::Component *, ::java::lang::Object *);
+public:
+  virtual void setComponentOrientation(::java::awt::ComponentOrientation *);
+  virtual void setColumnHeader(::javax::swing::JViewport *);
+  virtual void setColumnHeaderView(::java::awt::Component *);
+  virtual void setCorner(::java::lang::String *, ::java::awt::Component *);
+  virtual void setHorizontalScrollBar(::javax::swing::JScrollBar *);
+  virtual void setHorizontalScrollBarPolicy(jint);
+  virtual void setLayout(::java::awt::LayoutManager *);
+  virtual void setRowHeader(::javax::swing::JViewport *);
+  virtual void setRowHeaderView(::java::awt::Component *);
+  virtual void setVerticalScrollBar(::javax::swing::JScrollBar *);
+  virtual void setVerticalScrollBarPolicy(jint);
+  virtual void setWheelScrollingEnabled(jboolean);
+  virtual void setViewport(::javax::swing::JViewport *);
+  virtual void setViewportBorder(::javax::swing::border::Border *);
+  virtual void setViewportView(::java::awt::Component *);
+  virtual jboolean isValidateRoot();
+  JScrollPane();
+  JScrollPane(::java::awt::Component *);
+  JScrollPane(jint, jint);
+  JScrollPane(::java::awt::Component *, jint, jint);
+  virtual ::javax::swing::JScrollBar * createHorizontalScrollBar();
+  virtual ::javax::swing::JScrollBar * createVerticalScrollBar();
+public: // actually protected
+  virtual ::javax::swing::JViewport * createViewport();
+public:
+  virtual ::java::lang::String * getUIClassID();
+  virtual void updateUI();
+  virtual ::javax::swing::plaf::ScrollPaneUI * getUI();
+  virtual void setUI(::javax::swing::plaf::ScrollPaneUI *);
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+private:
+  static const jlong serialVersionUID = 5203525440012340014LL;
+public: // actually protected
+  ::javax::swing::JViewport * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) columnHeader;
+  ::javax::swing::JViewport * rowHeader;
+  ::java::awt::Component * lowerLeft;
+  ::java::awt::Component * lowerRight;
+  ::java::awt::Component * upperLeft;
+  ::java::awt::Component * upperRight;
+  ::javax::swing::JScrollBar * horizontalScrollBar;
+  jint horizontalScrollBarPolicy;
+  ::javax::swing::JScrollBar * verticalScrollBar;
+  jint verticalScrollBarPolicy;
+  ::javax::swing::JViewport * viewport;
+private:
+  ::javax::swing::border::Border * viewportBorder;
+  jboolean wheelScrollingEnabled;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JScrollPane__
diff --git a/libjava/javax/swing/JSeparator$AccessibleJSeparator.h b/libjava/javax/swing/JSeparator$AccessibleJSeparator.h
new file mode 100644
index 000000000..9d0db79d3
--- /dev/null
+++ b/libjava/javax/swing/JSeparator$AccessibleJSeparator.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JSeparator$AccessibleJSeparator__
+#define __javax_swing_JSeparator$AccessibleJSeparator__
+
+#pragma interface
+
+#include <javax/swing/JComponent$AccessibleJComponent.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleRole;
+    }
+    namespace swing
+    {
+        class JSeparator;
+        class JSeparator$AccessibleJSeparator;
+    }
+  }
+}
+
+class javax::swing::JSeparator$AccessibleJSeparator : public ::javax::swing::JComponent$AccessibleJComponent
+{
+
+public: // actually protected
+  JSeparator$AccessibleJSeparator(::javax::swing::JSeparator *);
+public:
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+private:
+  static const jlong serialVersionUID = 916332890553201095LL;
+public: // actually package-private
+  ::javax::swing::JSeparator * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JSeparator$AccessibleJSeparator__
diff --git a/libjava/javax/swing/JSeparator.h b/libjava/javax/swing/JSeparator.h
new file mode 100644
index 000000000..22d1a263f
--- /dev/null
+++ b/libjava/javax/swing/JSeparator.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JSeparator__
+#define __javax_swing_JSeparator__
+
+#pragma interface
+
+#include <javax/swing/JComponent.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class JSeparator;
+      namespace plaf
+      {
+          class SeparatorUI;
+      }
+    }
+  }
+}
+
+class javax::swing::JSeparator : public ::javax::swing::JComponent
+{
+
+public:
+  JSeparator();
+  JSeparator(jint);
+  virtual ::javax::swing::plaf::SeparatorUI * getUI();
+  virtual void setUI(::javax::swing::plaf::SeparatorUI *);
+  virtual void updateUI();
+  virtual ::java::lang::String * getUIClassID();
+  virtual jint getOrientation();
+  virtual void setOrientation(jint);
+public: // actually protected
+  virtual ::java::lang::String * paramString();
+public:
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+private:
+  static const jlong serialVersionUID = 125301223445282357LL;
+  jint __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) orientation;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JSeparator__
diff --git a/libjava/javax/swing/JSlider$1.h b/libjava/javax/swing/JSlider$1.h
new file mode 100644
index 000000000..0190b0348
--- /dev/null
+++ b/libjava/javax/swing/JSlider$1.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JSlider$1__
+#define __javax_swing_JSlider$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JSlider;
+        class JSlider$1;
+      namespace event
+      {
+          class ChangeEvent;
+      }
+    }
+  }
+}
+
+class javax::swing::JSlider$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  JSlider$1(::javax::swing::JSlider *);
+public:
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+public: // actually package-private
+  ::javax::swing::JSlider * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JSlider$1__
diff --git a/libjava/javax/swing/JSlider$AccessibleJSlider.h b/libjava/javax/swing/JSlider$AccessibleJSlider.h
new file mode 100644
index 000000000..9e3c2e8df
--- /dev/null
+++ b/libjava/javax/swing/JSlider$AccessibleJSlider.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JSlider$AccessibleJSlider__
+#define __javax_swing_JSlider$AccessibleJSlider__
+
+#pragma interface
+
+#include <javax/swing/JComponent$AccessibleJComponent.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleRole;
+        class AccessibleStateSet;
+        class AccessibleValue;
+    }
+    namespace swing
+    {
+        class JSlider;
+        class JSlider$AccessibleJSlider;
+    }
+  }
+}
+
+class javax::swing::JSlider$AccessibleJSlider : public ::javax::swing::JComponent$AccessibleJComponent
+{
+
+public: // actually protected
+  JSlider$AccessibleJSlider(::javax::swing::JSlider *);
+public:
+  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+  virtual ::javax::accessibility::AccessibleValue * getAccessibleValue();
+  virtual ::java::lang::Number * getCurrentAccessibleValue();
+  virtual jboolean setCurrentAccessibleValue(::java::lang::Number *);
+  virtual ::java::lang::Number * getMinimumAccessibleValue();
+  virtual ::java::lang::Number * getMaximumAccessibleValue();
+private:
+  static const jlong serialVersionUID = -6301740148041106789LL;
+public: // actually package-private
+  ::javax::swing::JSlider * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JSlider$AccessibleJSlider__
diff --git a/libjava/javax/swing/JSlider$LabelUIResource.h b/libjava/javax/swing/JSlider$LabelUIResource.h
new file mode 100644
index 000000000..588327515
--- /dev/null
+++ b/libjava/javax/swing/JSlider$LabelUIResource.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JSlider$LabelUIResource__
+#define __javax_swing_JSlider$LabelUIResource__
+
+#pragma interface
+
+#include <javax/swing/JLabel.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JSlider;
+        class JSlider$LabelUIResource;
+    }
+  }
+}
+
+class javax::swing::JSlider$LabelUIResource : public ::javax::swing::JLabel
+{
+
+public: // actually package-private
+  JSlider$LabelUIResource(::javax::swing::JSlider *, ::java::lang::String *, jint);
+  ::javax::swing::JSlider * __attribute__((aligned(__alignof__( ::javax::swing::JLabel)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JSlider$LabelUIResource__
diff --git a/libjava/javax/swing/JSlider.h b/libjava/javax/swing/JSlider.h
new file mode 100644
index 000000000..e7a54950f
--- /dev/null
+++ b/libjava/javax/swing/JSlider.h
@@ -0,0 +1,120 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JSlider__
+#define __javax_swing_JSlider__
+
+#pragma interface
+
+#include <javax/swing/JComponent.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class BoundedRangeModel;
+        class JSlider;
+      namespace event
+      {
+          class ChangeEvent;
+          class ChangeListener;
+      }
+      namespace plaf
+      {
+          class SliderUI;
+      }
+    }
+  }
+}
+
+class javax::swing::JSlider : public ::javax::swing::JComponent
+{
+
+public:
+  JSlider();
+  JSlider(jint);
+  JSlider(jint, jint);
+  JSlider(jint, jint, jint);
+  JSlider(jint, jint, jint, jint);
+  JSlider(::javax::swing::BoundedRangeModel *);
+  virtual jint getValue();
+  virtual void setValue(jint);
+  virtual ::javax::swing::plaf::SliderUI * getUI();
+  virtual void setUI(::javax::swing::plaf::SliderUI *);
+  virtual void updateUI();
+  virtual ::java::lang::String * getUIClassID();
+public: // actually protected
+  virtual ::javax::swing::event::ChangeListener * createChangeListener();
+public:
+  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
+  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
+public: // actually protected
+  virtual void fireStateChanged();
+public:
+  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
+  virtual ::javax::swing::BoundedRangeModel * getModel();
+  virtual void setModel(::javax::swing::BoundedRangeModel *);
+  virtual jint getMinimum();
+  virtual void setMinimum(jint);
+  virtual jint getMaximum();
+  virtual void setMaximum(jint);
+  virtual jboolean getValueIsAdjusting();
+  virtual void setValueIsAdjusting(jboolean);
+  virtual jint getExtent();
+  virtual void setExtent(jint);
+  virtual jint getOrientation();
+  virtual void setOrientation(jint);
+  virtual ::java::util::Dictionary * getLabelTable();
+  virtual void setLabelTable(::java::util::Dictionary *);
+public: // actually protected
+  virtual void updateLabelUIs();
+public:
+  virtual ::java::util::Hashtable * createStandardLabels(jint);
+  virtual ::java::util::Hashtable * createStandardLabels(jint, jint);
+  virtual jboolean getInverted();
+  virtual void setInverted(jboolean);
+  virtual jint getMajorTickSpacing();
+  virtual void setMajorTickSpacing(jint);
+  virtual jint getMinorTickSpacing();
+  virtual void setMinorTickSpacing(jint);
+  virtual jboolean getSnapToTicks();
+  virtual void setSnapToTicks(jboolean);
+  virtual jboolean getPaintTicks();
+  virtual void setPaintTicks(jboolean);
+  virtual jboolean getPaintTrack();
+  virtual void setPaintTrack(jboolean);
+  virtual jboolean getPaintLabels();
+  virtual void setPaintLabels(jboolean);
+public: // actually protected
+  virtual ::java::lang::String * paramString();
+public:
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+private:
+  static const jlong serialVersionUID = -1441275936141218479LL;
+  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) paintTicks;
+  jboolean paintTrack;
+  jboolean paintLabels;
+  ::java::util::Dictionary * labelTable;
+public: // actually protected
+  ::javax::swing::BoundedRangeModel * sliderModel;
+  jint majorTickSpacing;
+  jint minorTickSpacing;
+  jboolean snapToTicks;
+  jint orientation;
+private:
+  jboolean isInverted;
+public: // actually protected
+  ::javax::swing::event::ChangeListener * changeListener;
+  ::javax::swing::event::ChangeEvent * changeEvent;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JSlider__
diff --git a/libjava/javax/swing/JSpinner$DateEditor.h b/libjava/javax/swing/JSpinner$DateEditor.h
new file mode 100644
index 000000000..228da355c
--- /dev/null
+++ b/libjava/javax/swing/JSpinner$DateEditor.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JSpinner$DateEditor__
+#define __javax_swing_JSpinner$DateEditor__
+
+#pragma interface
+
+#include <javax/swing/JSpinner$DefaultEditor.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class SimpleDateFormat;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JSpinner;
+        class JSpinner$DateEditor;
+        class SpinnerDateModel;
+    }
+  }
+}
+
+class javax::swing::JSpinner$DateEditor : public ::javax::swing::JSpinner$DefaultEditor
+{
+
+public:
+  JSpinner$DateEditor(::javax::swing::JSpinner *);
+  JSpinner$DateEditor(::javax::swing::JSpinner *, ::java::lang::String *);
+  virtual ::java::text::SimpleDateFormat * getFormat();
+  virtual ::javax::swing::SpinnerDateModel * getModel();
+private:
+  static const jlong serialVersionUID = -4279356973770397815LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JSpinner$DateEditor__
diff --git a/libjava/javax/swing/JSpinner$DateEditorFormatter.h b/libjava/javax/swing/JSpinner$DateEditorFormatter.h
new file mode 100644
index 000000000..f83b4348a
--- /dev/null
+++ b/libjava/javax/swing/JSpinner$DateEditorFormatter.h
@@ -0,0 +1,30 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JSpinner$DateEditorFormatter__
+#define __javax_swing_JSpinner$DateEditorFormatter__
+
+#pragma interface
+
+#include <javax/swing/text/DateFormatter.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JSpinner$DateEditorFormatter;
+    }
+  }
+}
+
+class javax::swing::JSpinner$DateEditorFormatter : public ::javax::swing::text::DateFormatter
+{
+
+public:
+  JSpinner$DateEditorFormatter();
+  JSpinner$DateEditorFormatter(::java::lang::String *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JSpinner$DateEditorFormatter__
diff --git a/libjava/javax/swing/JSpinner$DefaultEditor.h b/libjava/javax/swing/JSpinner$DefaultEditor.h
new file mode 100644
index 000000000..b586f07b4
--- /dev/null
+++ b/libjava/javax/swing/JSpinner$DefaultEditor.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JSpinner$DefaultEditor__
+#define __javax_swing_JSpinner$DefaultEditor__
+
+#pragma interface
+
+#include <javax/swing/JPanel.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+    }
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JFormattedTextField;
+        class JSpinner;
+        class JSpinner$DefaultEditor;
+      namespace event
+      {
+          class ChangeEvent;
+      }
+    }
+  }
+}
+
+class javax::swing::JSpinner$DefaultEditor : public ::javax::swing::JPanel
+{
+
+public:
+  JSpinner$DefaultEditor(::javax::swing::JSpinner *);
+  virtual ::javax::swing::JSpinner * getSpinner();
+  virtual void commitEdit();
+  virtual void dismiss(::javax::swing::JSpinner *);
+  virtual ::javax::swing::JFormattedTextField * getTextField();
+  virtual void layoutContainer(::java::awt::Container *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+  virtual void removeLayoutComponent(::java::awt::Component *);
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+private:
+  ::javax::swing::JSpinner * __attribute__((aligned(__alignof__( ::javax::swing::JPanel)))) spinner;
+public: // actually package-private
+  ::javax::swing::JFormattedTextField * ftf;
+private:
+  static const jlong serialVersionUID = -5317788736173368172LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JSpinner$DefaultEditor__
diff --git a/libjava/javax/swing/JSpinner$ListEditor.h b/libjava/javax/swing/JSpinner$ListEditor.h
new file mode 100644
index 000000000..9ee06ff71
--- /dev/null
+++ b/libjava/javax/swing/JSpinner$ListEditor.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JSpinner$ListEditor__
+#define __javax_swing_JSpinner$ListEditor__
+
+#pragma interface
+
+#include <javax/swing/JSpinner$DefaultEditor.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JSpinner;
+        class JSpinner$ListEditor;
+        class SpinnerListModel;
+    }
+  }
+}
+
+class javax::swing::JSpinner$ListEditor : public ::javax::swing::JSpinner$DefaultEditor
+{
+
+public:
+  JSpinner$ListEditor(::javax::swing::JSpinner *);
+  virtual ::javax::swing::SpinnerListModel * getModel();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JSpinner$ListEditor__
diff --git a/libjava/javax/swing/JSpinner$ModelListener.h b/libjava/javax/swing/JSpinner$ModelListener.h
new file mode 100644
index 000000000..b91ea5e30
--- /dev/null
+++ b/libjava/javax/swing/JSpinner$ModelListener.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JSpinner$ModelListener__
+#define __javax_swing_JSpinner$ModelListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JSpinner;
+        class JSpinner$ModelListener;
+      namespace event
+      {
+          class ChangeEvent;
+      }
+    }
+  }
+}
+
+class javax::swing::JSpinner$ModelListener : public ::java::lang::Object
+{
+
+public:
+  JSpinner$ModelListener(::javax::swing::JSpinner *);
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+public: // actually package-private
+  ::javax::swing::JSpinner * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JSpinner$ModelListener__
diff --git a/libjava/javax/swing/JSpinner$NumberEditor.h b/libjava/javax/swing/JSpinner$NumberEditor.h
new file mode 100644
index 000000000..a3a8dd166
--- /dev/null
+++ b/libjava/javax/swing/JSpinner$NumberEditor.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JSpinner$NumberEditor__
+#define __javax_swing_JSpinner$NumberEditor__
+
+#pragma interface
+
+#include <javax/swing/JSpinner$DefaultEditor.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class DecimalFormat;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JSpinner;
+        class JSpinner$NumberEditor;
+        class SpinnerNumberModel;
+    }
+  }
+}
+
+class javax::swing::JSpinner$NumberEditor : public ::javax::swing::JSpinner$DefaultEditor
+{
+
+public:
+  JSpinner$NumberEditor(::javax::swing::JSpinner *);
+  JSpinner$NumberEditor(::javax::swing::JSpinner *, ::java::lang::String *);
+  virtual ::java::text::DecimalFormat * getFormat();
+  virtual ::javax::swing::SpinnerNumberModel * getModel();
+private:
+  static const jlong serialVersionUID = 3791956183098282942LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JSpinner$NumberEditor__
diff --git a/libjava/javax/swing/JSpinner$NumberEditorFormatter.h b/libjava/javax/swing/JSpinner$NumberEditorFormatter.h
new file mode 100644
index 000000000..6c2550415
--- /dev/null
+++ b/libjava/javax/swing/JSpinner$NumberEditorFormatter.h
@@ -0,0 +1,30 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JSpinner$NumberEditorFormatter__
+#define __javax_swing_JSpinner$NumberEditorFormatter__
+
+#pragma interface
+
+#include <javax/swing/text/NumberFormatter.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JSpinner$NumberEditorFormatter;
+    }
+  }
+}
+
+class javax::swing::JSpinner$NumberEditorFormatter : public ::javax::swing::text::NumberFormatter
+{
+
+public:
+  JSpinner$NumberEditorFormatter();
+  JSpinner$NumberEditorFormatter(::java::lang::String *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JSpinner$NumberEditorFormatter__
diff --git a/libjava/javax/swing/JSpinner.h b/libjava/javax/swing/JSpinner.h
new file mode 100644
index 000000000..5457d6f11
--- /dev/null
+++ b/libjava/javax/swing/JSpinner.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JSpinner__
+#define __javax_swing_JSpinner__
+
+#pragma interface
+
+#include <javax/swing/JComponent.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class JSpinner;
+        class SpinnerModel;
+      namespace event
+      {
+          class ChangeListener;
+      }
+      namespace plaf
+      {
+          class SpinnerUI;
+      }
+    }
+  }
+}
+
+class javax::swing::JSpinner : public ::javax::swing::JComponent
+{
+
+public:
+  JSpinner();
+  JSpinner(::javax::swing::SpinnerModel *);
+  virtual void commitEdit();
+  virtual ::javax::swing::JComponent * getEditor();
+  virtual void setEditor(::javax::swing::JComponent *);
+  virtual ::javax::swing::SpinnerModel * getModel();
+  virtual void setModel(::javax::swing::SpinnerModel *);
+  virtual ::java::lang::Object * getNextValue();
+  virtual ::java::lang::Object * getPreviousValue();
+  virtual ::javax::swing::plaf::SpinnerUI * getUI();
+  virtual ::java::lang::Object * getValue();
+  virtual void setValue(::java::lang::Object *);
+  virtual ::java::lang::String * getUIClassID();
+  virtual void updateUI();
+  virtual void setUI(::javax::swing::plaf::SpinnerUI *);
+  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
+  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
+  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
+public: // actually protected
+  virtual void fireStateChanged();
+  virtual ::javax::swing::JComponent * createEditor(::javax::swing::SpinnerModel *);
+private:
+  ::javax::swing::SpinnerModel * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) model;
+  ::javax::swing::JComponent * editor;
+  static const jlong serialVersionUID = 3412663575706551720LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JSpinner__
diff --git a/libjava/javax/swing/JSplitPane$AccessibleJSplitPane.h b/libjava/javax/swing/JSplitPane$AccessibleJSplitPane.h
new file mode 100644
index 000000000..3144301d5
--- /dev/null
+++ b/libjava/javax/swing/JSplitPane$AccessibleJSplitPane.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JSplitPane$AccessibleJSplitPane__
+#define __javax_swing_JSplitPane$AccessibleJSplitPane__
+
+#pragma interface
+
+#include <javax/swing/JComponent$AccessibleJComponent.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleRole;
+        class AccessibleStateSet;
+        class AccessibleValue;
+    }
+    namespace swing
+    {
+        class JSplitPane;
+        class JSplitPane$AccessibleJSplitPane;
+    }
+  }
+}
+
+class javax::swing::JSplitPane$AccessibleJSplitPane : public ::javax::swing::JComponent$AccessibleJComponent
+{
+
+public: // actually protected
+  JSplitPane$AccessibleJSplitPane(::javax::swing::JSplitPane *);
+public:
+  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+  virtual ::javax::accessibility::AccessibleValue * getAccessibleValue();
+  virtual ::java::lang::Number * getCurrentAccessibleValue();
+  virtual jboolean setCurrentAccessibleValue(::java::lang::Number *);
+  virtual ::java::lang::Number * getMinimumAccessibleValue();
+  virtual ::java::lang::Number * getMaximumAccessibleValue();
+private:
+  static const jlong serialVersionUID = -1788116871416305366LL;
+public: // actually package-private
+  ::javax::swing::JSplitPane * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JSplitPane$AccessibleJSplitPane__
diff --git a/libjava/javax/swing/JSplitPane.h b/libjava/javax/swing/JSplitPane.h
new file mode 100644
index 000000000..31405bd87
--- /dev/null
+++ b/libjava/javax/swing/JSplitPane.h
@@ -0,0 +1,124 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JSplitPane__
+#define __javax_swing_JSplitPane__
+
+#pragma interface
+
+#include <javax/swing/JComponent.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class JSplitPane;
+      namespace plaf
+      {
+          class SplitPaneUI;
+      }
+    }
+  }
+}
+
+class javax::swing::JSplitPane : public ::javax::swing::JComponent
+{
+
+public:
+  JSplitPane(jint, jboolean, ::java::awt::Component *, ::java::awt::Component *);
+  JSplitPane(jint, ::java::awt::Component *, ::java::awt::Component *);
+  JSplitPane(jint, jboolean);
+  JSplitPane(jint);
+  JSplitPane();
+public: // actually protected
+  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
+public:
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+  virtual ::java::awt::Component * getBottomComponent();
+  virtual jint getDividerLocation();
+  virtual jint getDividerSize();
+  virtual jint getLastDividerLocation();
+  virtual ::java::awt::Component * getLeftComponent();
+  virtual jint getMaximumDividerLocation();
+  virtual jint getMinimumDividerLocation();
+  virtual jint getOrientation();
+  virtual jdouble getResizeWeight();
+  virtual ::java::awt::Component * getRightComponent();
+  virtual ::java::awt::Component * getTopComponent();
+  virtual ::javax::swing::plaf::SplitPaneUI * getUI();
+  virtual jboolean isContinuousLayout();
+  virtual jboolean isOneTouchExpandable();
+  virtual jboolean isValidateRoot();
+public: // actually protected
+  virtual void paintChildren(::java::awt::Graphics *);
+  virtual ::java::lang::String * paramString();
+public:
+  virtual void remove(::java::awt::Component *);
+  virtual void remove(jint);
+  virtual void removeAll();
+  virtual void resetToPreferredSizes();
+  virtual void setBottomComponent(::java::awt::Component *);
+  virtual void setContinuousLayout(jboolean);
+  virtual void setDividerLocation(jdouble);
+  virtual void setDividerLocation(jint);
+  virtual void setDividerSize(jint);
+  virtual void setLastDividerLocation(jint);
+  virtual void setLeftComponent(::java::awt::Component *);
+  virtual void setOneTouchExpandable(jboolean);
+  virtual void setOrientation(jint);
+  virtual void setResizeWeight(jdouble);
+  virtual void setRightComponent(::java::awt::Component *);
+  virtual void setTopComponent(::java::awt::Component *);
+  virtual void setUI(::javax::swing::plaf::SplitPaneUI *);
+  virtual void updateUI();
+  virtual ::java::lang::String * getUIClassID();
+public: // actually package-private
+  virtual void setUIProperty(::java::lang::String *, ::java::lang::Object *);
+private:
+  static const jlong serialVersionUID = -5634142046175988380LL;
+public:
+  static ::java::lang::String * BOTTOM;
+  static ::java::lang::String * CONTINUOUS_LAYOUT_PROPERTY;
+  static ::java::lang::String * DIVIDER;
+  static ::java::lang::String * DIVIDER_LOCATION_PROPERTY;
+  static ::java::lang::String * DIVIDER_SIZE_PROPERTY;
+  static const jint HORIZONTAL_SPLIT = 1;
+  static ::java::lang::String * LAST_DIVIDER_LOCATION_PROPERTY;
+  static ::java::lang::String * LEFT;
+  static ::java::lang::String * ONE_TOUCH_EXPANDABLE_PROPERTY;
+  static ::java::lang::String * ORIENTATION_PROPERTY;
+  static ::java::lang::String * RESIZE_WEIGHT_PROPERTY;
+  static ::java::lang::String * RIGHT;
+  static ::java::lang::String * TOP;
+  static const jint VERTICAL_SPLIT = 0;
+public: // actually protected
+  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) continuousLayout;
+  jboolean oneTouchExpandable;
+  jint dividerSize;
+  jint lastDividerLocation;
+  jint orientation;
+  ::java::awt::Component * leftComponent;
+  ::java::awt::Component * rightComponent;
+private:
+  jint dividerLocation;
+  jdouble resizeWeight;
+  jboolean clientDividerSizeSet;
+  jboolean clientOneTouchExpandableSet;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JSplitPane__
diff --git a/libjava/javax/swing/JTabbedPane$AccessibleJTabbedPane.h b/libjava/javax/swing/JTabbedPane$AccessibleJTabbedPane.h
new file mode 100644
index 000000000..8769fad04
--- /dev/null
+++ b/libjava/javax/swing/JTabbedPane$AccessibleJTabbedPane.h
@@ -0,0 +1,65 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JTabbedPane$AccessibleJTabbedPane__
+#define __javax_swing_JTabbedPane$AccessibleJTabbedPane__
+
+#pragma interface
+
+#include <javax/swing/JComponent$AccessibleJComponent.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Point;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+        class AccessibleRole;
+        class AccessibleSelection;
+    }
+    namespace swing
+    {
+        class JTabbedPane;
+        class JTabbedPane$AccessibleJTabbedPane;
+      namespace event
+      {
+          class ChangeEvent;
+      }
+    }
+  }
+}
+
+class javax::swing::JTabbedPane$AccessibleJTabbedPane : public ::javax::swing::JComponent$AccessibleJComponent
+{
+
+public:
+  JTabbedPane$AccessibleJTabbedPane(::javax::swing::JTabbedPane *);
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+  virtual jint getAccessibleChildrenCount();
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
+  virtual ::javax::accessibility::AccessibleSelection * getAccessibleSelection();
+  virtual ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Point *);
+  virtual jint getAccessibleSelectionCount();
+  virtual ::javax::accessibility::Accessible * getAccessibleSelection(jint);
+  virtual jboolean isAccessibleChildSelected(jint);
+  virtual void addAccessibleSelection(jint);
+  virtual void removeAccessibleSelection(jint);
+  virtual void clearAccessibleSelection();
+  virtual void selectAllAccessibleSelection();
+private:
+  static const jlong serialVersionUID = 7610530885966830483LL;
+public: // actually package-private
+  ::javax::swing::JTabbedPane * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JTabbedPane$AccessibleJTabbedPane__
diff --git a/libjava/javax/swing/JTabbedPane$ModelListener.h b/libjava/javax/swing/JTabbedPane$ModelListener.h
new file mode 100644
index 000000000..04ffcc196
--- /dev/null
+++ b/libjava/javax/swing/JTabbedPane$ModelListener.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JTabbedPane$ModelListener__
+#define __javax_swing_JTabbedPane$ModelListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JTabbedPane;
+        class JTabbedPane$ModelListener;
+      namespace event
+      {
+          class ChangeEvent;
+      }
+    }
+  }
+}
+
+class javax::swing::JTabbedPane$ModelListener : public ::java::lang::Object
+{
+
+public: // actually protected
+  JTabbedPane$ModelListener(::javax::swing::JTabbedPane *);
+public:
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+private:
+  static const jlong serialVersionUID = 497359819958114132LL;
+public: // actually package-private
+  ::javax::swing::JTabbedPane * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JTabbedPane$ModelListener__
diff --git a/libjava/javax/swing/JTabbedPane$Page.h b/libjava/javax/swing/JTabbedPane$Page.h
new file mode 100644
index 000000000..346289a53
--- /dev/null
+++ b/libjava/javax/swing/JTabbedPane$Page.h
@@ -0,0 +1,91 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JTabbedPane$Page__
+#define __javax_swing_JTabbedPane$Page__
+
+#pragma interface
+
+#include <javax/accessibility/AccessibleContext.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+        class AccessibleContext;
+        class AccessibleRole;
+        class AccessibleStateSet;
+    }
+    namespace swing
+    {
+        class Icon;
+        class JTabbedPane;
+        class JTabbedPane$Page;
+    }
+  }
+}
+
+class javax::swing::JTabbedPane$Page : public ::javax::accessibility::AccessibleContext
+{
+
+public: // actually protected
+  JTabbedPane$Page(::javax::swing::JTabbedPane *, ::java::lang::String *, ::javax::swing::Icon *, ::java::awt::Component *, ::java::lang::String *);
+public:
+  virtual ::java::awt::Component * getComponent();
+  virtual void setComponent(::java::awt::Component *);
+  virtual ::java::lang::String * getTip();
+  virtual void setTip(::java::lang::String *);
+  virtual ::java::awt::Color * getBackground();
+  virtual void setBackground(::java::awt::Color *);
+  virtual ::java::awt::Color * getForeground();
+  virtual void setForeground(::java::awt::Color *);
+  virtual ::java::lang::String * getTitle();
+  virtual void setTitle(::java::lang::String *);
+  virtual ::javax::swing::Icon * getIcon();
+  virtual void setIcon(::javax::swing::Icon *);
+  virtual ::javax::swing::Icon * getDisabledIcon();
+  virtual void setDisabledIcon(::javax::swing::Icon *);
+  virtual jboolean isEnabled();
+  virtual void setEnabled(jboolean);
+  virtual jint getMnemonic();
+  virtual void setMnemonic(jint);
+  virtual void setMnemonic(jchar);
+  virtual jint getDisplayedMnemonicIndex();
+  virtual void setDisplayedMnemonicIndex(jint);
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+  virtual ::java::lang::String * getAccessibleName();
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
+  virtual jint getAccessibleIndexInParent();
+  virtual jint getAccessibleChildrenCount();
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
+  virtual ::java::util::Locale * getLocale();
+private:
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::accessibility::AccessibleContext)))) tip;
+  ::java::awt::Component * component;
+  ::javax::swing::Icon * icon;
+  ::javax::swing::Icon * disabledIcon;
+  jboolean enabled;
+  ::java::lang::String * title;
+  ::java::awt::Color * bg;
+  ::java::awt::Color * fg;
+  jint mnemonicKey;
+  jint underlinedChar;
+  static const jlong serialVersionUID = 1614381073220130939LL;
+public: // actually package-private
+  ::javax::swing::JTabbedPane * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JTabbedPane$Page__
diff --git a/libjava/javax/swing/JTabbedPane.h b/libjava/javax/swing/JTabbedPane.h
new file mode 100644
index 000000000..8b286e5c1
--- /dev/null
+++ b/libjava/javax/swing/JTabbedPane.h
@@ -0,0 +1,148 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JTabbedPane__
+#define __javax_swing_JTabbedPane__
+
+#pragma interface
+
+#include <javax/swing/JComponent.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Rectangle;
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class Icon;
+        class JTabbedPane;
+        class SingleSelectionModel;
+      namespace event
+      {
+          class ChangeEvent;
+          class ChangeListener;
+      }
+      namespace plaf
+      {
+          class TabbedPaneUI;
+      }
+    }
+  }
+}
+
+class javax::swing::JTabbedPane : public ::javax::swing::JComponent
+{
+
+public:
+  JTabbedPane();
+  JTabbedPane(jint);
+  JTabbedPane(jint, jint);
+  virtual ::javax::swing::plaf::TabbedPaneUI * getUI();
+  virtual void setUI(::javax::swing::plaf::TabbedPaneUI *);
+  virtual void updateUI();
+  virtual ::java::lang::String * getUIClassID();
+public: // actually protected
+  virtual ::javax::swing::event::ChangeListener * createChangeListener();
+public:
+  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
+  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
+public: // actually protected
+  virtual void fireStateChanged();
+public:
+  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
+  virtual ::javax::swing::SingleSelectionModel * getModel();
+  virtual void setModel(::javax::swing::SingleSelectionModel *);
+  virtual jint getTabPlacement();
+  virtual void setTabPlacement(jint);
+  virtual jint getTabLayoutPolicy();
+  virtual void setTabLayoutPolicy(jint);
+  virtual jint getSelectedIndex();
+private:
+  void checkIndex(jint, jint, jint);
+public:
+  virtual void setSelectedIndex(jint);
+  virtual ::java::awt::Component * getSelectedComponent();
+  virtual void setSelectedComponent(::java::awt::Component *);
+  virtual void insertTab(::java::lang::String *, ::javax::swing::Icon *, ::java::awt::Component *, ::java::lang::String *, jint);
+  virtual void addTab(::java::lang::String *, ::javax::swing::Icon *, ::java::awt::Component *, ::java::lang::String *);
+  virtual void addTab(::java::lang::String *, ::javax::swing::Icon *, ::java::awt::Component *);
+  virtual void addTab(::java::lang::String *, ::java::awt::Component *);
+  virtual ::java::awt::Component * add(::java::awt::Component *);
+  virtual ::java::awt::Component * add(::java::lang::String *, ::java::awt::Component *);
+  virtual ::java::awt::Component * add(::java::awt::Component *, jint);
+  virtual void add(::java::awt::Component *, ::java::lang::Object *);
+  virtual void add(::java::awt::Component *, ::java::lang::Object *, jint);
+  virtual void removeTabAt(jint);
+  virtual void remove(::java::awt::Component *);
+  virtual void remove(jint);
+  virtual void removeAll();
+  virtual jint getTabCount();
+  virtual jint getTabRunCount();
+  virtual ::java::lang::String * getTitleAt(jint);
+  virtual ::javax::swing::Icon * getIconAt(jint);
+  virtual ::javax::swing::Icon * getDisabledIconAt(jint);
+  virtual ::java::lang::String * getToolTipTextAt(jint);
+  virtual ::java::awt::Color * getForegroundAt(jint);
+  virtual ::java::awt::Color * getBackgroundAt(jint);
+  virtual ::java::awt::Component * getComponentAt(jint);
+  virtual jboolean isEnabledAt(jint);
+  virtual jint getMnemonicAt(jint);
+  virtual jint getDisplayedMnemonicIndexAt(jint);
+  virtual ::java::awt::Rectangle * getBoundsAt(jint);
+  virtual void setTitleAt(jint, ::java::lang::String *);
+  virtual void setIconAt(jint, ::javax::swing::Icon *);
+  virtual void setDisabledIconAt(jint, ::javax::swing::Icon *);
+  virtual void setToolTipTextAt(jint, ::java::lang::String *);
+  virtual void setBackgroundAt(jint, ::java::awt::Color *);
+  virtual void setForegroundAt(jint, ::java::awt::Color *);
+  virtual void setEnabledAt(jint, jboolean);
+  virtual void setComponentAt(jint, ::java::awt::Component *);
+  virtual void setDisplayedMnemonicIndexAt(jint, jint);
+  virtual void setMnemonicAt(jint, jint);
+  virtual jint indexOfTab(::java::lang::String *);
+  virtual jint indexOfTab(::javax::swing::Icon *);
+  virtual jint indexOfComponent(::java::awt::Component *);
+  virtual jint indexAtLocation(jint, jint);
+  virtual ::java::lang::String * getToolTipText(::java::awt::event::MouseEvent *);
+public: // actually protected
+  virtual ::java::lang::String * paramString();
+public:
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+private:
+  static const jlong serialVersionUID = 1614381073220130939LL;
+public: // actually protected
+  ::javax::swing::event::ChangeEvent * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) changeEvent;
+  ::javax::swing::event::ChangeListener * changeListener;
+  ::javax::swing::SingleSelectionModel * model;
+public:
+  static const jint SCROLL_TAB_LAYOUT = 1;
+  static const jint WRAP_TAB_LAYOUT = 0;
+public: // actually protected
+  jint tabPlacement;
+private:
+  jint layoutPolicy;
+public: // actually package-private
+  ::java::util::Vector * tabs;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JTabbedPane__
diff --git a/libjava/javax/swing/JTable$AccessibleJTable$AccessibleJTableCell.h b/libjava/javax/swing/JTable$AccessibleJTable$AccessibleJTableCell.h
new file mode 100644
index 000000000..0264034ab
--- /dev/null
+++ b/libjava/javax/swing/JTable$AccessibleJTable$AccessibleJTableCell.h
@@ -0,0 +1,97 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JTable$AccessibleJTable$AccessibleJTableCell__
+#define __javax_swing_JTable$AccessibleJTable$AccessibleJTableCell__
+
+#pragma interface
+
+#include <javax/accessibility/AccessibleContext.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Cursor;
+        class Dimension;
+        class Font;
+        class FontMetrics;
+        class Point;
+        class Rectangle;
+      namespace event
+      {
+          class FocusListener;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+        class AccessibleContext;
+        class AccessibleRole;
+        class AccessibleStateSet;
+    }
+    namespace swing
+    {
+        class JTable;
+        class JTable$AccessibleJTable;
+        class JTable$AccessibleJTable$AccessibleJTableCell;
+    }
+  }
+}
+
+class javax::swing::JTable$AccessibleJTable$AccessibleJTableCell : public ::javax::accessibility::AccessibleContext
+{
+
+public:
+  JTable$AccessibleJTable$AccessibleJTableCell(::javax::swing::JTable$AccessibleJTable *, ::javax::swing::JTable *, jint, jint, jint);
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
+  virtual jint getAccessibleIndexInParent();
+  virtual jint getAccessibleChildrenCount();
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
+  virtual ::java::util::Locale * getLocale();
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+  virtual ::java::awt::Color * getBackground();
+  virtual void setBackground(::java::awt::Color *);
+  virtual ::java::awt::Color * getForeground();
+  virtual void setForeground(::java::awt::Color *);
+  virtual ::java::awt::Cursor * getCursor();
+  virtual void setCursor(::java::awt::Cursor *);
+  virtual ::java::awt::Font * getFont();
+  virtual void setFont(::java::awt::Font *);
+  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
+  virtual jboolean isEnabled();
+  virtual void setEnabled(jboolean);
+  virtual jboolean isVisible();
+  virtual void setVisible(jboolean);
+  virtual jboolean isShowing();
+  virtual jboolean contains(::java::awt::Point *);
+  virtual ::java::awt::Point * getLocationOnScreen();
+  virtual ::java::awt::Point * getLocation();
+  virtual void setLocation(::java::awt::Point *);
+  virtual ::java::awt::Rectangle * getBounds();
+  virtual void setBounds(::java::awt::Rectangle *);
+  virtual ::java::awt::Dimension * getSize();
+  virtual void setSize(::java::awt::Dimension *);
+  virtual ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Point *);
+  virtual jboolean isFocusTraversable();
+  virtual void requestFocus();
+  virtual void addFocusListener(::java::awt::event::FocusListener *);
+  virtual void removeFocusListener(::java::awt::event::FocusListener *);
+private:
+  ::javax::swing::JTable * __attribute__((aligned(__alignof__( ::javax::accessibility::AccessibleContext)))) table;
+  jint row;
+  jint column;
+  jint index;
+public: // actually package-private
+  ::javax::swing::JTable$AccessibleJTable * this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JTable$AccessibleJTable$AccessibleJTableCell__
diff --git a/libjava/javax/swing/JTable$AccessibleJTable$AccessibleJTableHeaderCell.h b/libjava/javax/swing/JTable$AccessibleJTable$AccessibleJTableHeaderCell.h
new file mode 100644
index 000000000..2a7e6aa61
--- /dev/null
+++ b/libjava/javax/swing/JTable$AccessibleJTable$AccessibleJTableHeaderCell.h
@@ -0,0 +1,101 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JTable$AccessibleJTable$AccessibleJTableHeaderCell__
+#define __javax_swing_JTable$AccessibleJTable$AccessibleJTableHeaderCell__
+
+#pragma interface
+
+#include <javax/accessibility/AccessibleContext.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Cursor;
+        class Dimension;
+        class Font;
+        class FontMetrics;
+        class Point;
+        class Rectangle;
+      namespace event
+      {
+          class FocusListener;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+        class AccessibleContext;
+        class AccessibleRole;
+        class AccessibleStateSet;
+    }
+    namespace swing
+    {
+        class JTable$AccessibleJTable;
+        class JTable$AccessibleJTable$AccessibleJTableHeaderCell;
+      namespace table
+      {
+          class JTableHeader;
+      }
+    }
+  }
+}
+
+class javax::swing::JTable$AccessibleJTable$AccessibleJTableHeaderCell : public ::javax::accessibility::AccessibleContext
+{
+
+  JTable$AccessibleJTable$AccessibleJTableHeaderCell(::javax::swing::JTable$AccessibleJTable *, ::javax::swing::table::JTableHeader *, ::java::awt::Component *, jint, jint);
+public: // actually package-private
+  virtual ::java::awt::Component * getColumnHeaderRenderer();
+public:
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
+  virtual jint getAccessibleIndexInParent();
+  virtual jint getAccessibleChildrenCount();
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
+  virtual ::java::util::Locale * getLocale();
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+  virtual ::java::awt::Color * getBackground();
+  virtual void setBackground(::java::awt::Color *);
+  virtual ::java::awt::Color * getForeground();
+  virtual void setForeground(::java::awt::Color *);
+  virtual ::java::awt::Cursor * getCursor();
+  virtual void setCursor(::java::awt::Cursor *);
+  virtual ::java::awt::Font * getFont();
+  virtual void setFont(::java::awt::Font *);
+  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
+  virtual jboolean isEnabled();
+  virtual void setEnabled(jboolean);
+  virtual jboolean isVisible();
+  virtual void setVisible(jboolean);
+  virtual jboolean isShowing();
+  virtual jboolean contains(::java::awt::Point *);
+  virtual ::java::awt::Point * getLocationOnScreen();
+  virtual ::java::awt::Point * getLocation();
+  virtual void setLocation(::java::awt::Point *);
+  virtual ::java::awt::Rectangle * getBounds();
+  virtual void setBounds(::java::awt::Rectangle *);
+  virtual ::java::awt::Dimension * getSize();
+  virtual void setSize(::java::awt::Dimension *);
+  virtual ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Point *);
+  virtual jboolean isFocusTraversable();
+  virtual void requestFocus();
+  virtual void addFocusListener(::java::awt::event::FocusListener *);
+  virtual void removeFocusListener(::java::awt::event::FocusListener *);
+public: // actually package-private
+  JTable$AccessibleJTable$AccessibleJTableHeaderCell(::javax::swing::JTable$AccessibleJTable *, ::javax::swing::table::JTableHeader *, ::java::awt::Component *, jint, jint, ::javax::swing::JTable$AccessibleJTable$AccessibleJTableHeaderCell *);
+  ::javax::swing::table::JTableHeader * __attribute__((aligned(__alignof__( ::javax::accessibility::AccessibleContext)))) header;
+  jint columnIndex;
+  ::javax::swing::JTable$AccessibleJTable * this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JTable$AccessibleJTable$AccessibleJTableHeaderCell__
diff --git a/libjava/javax/swing/JTable$AccessibleJTable$AccessibleJTableModelChange.h b/libjava/javax/swing/JTable$AccessibleJTable$AccessibleJTableModelChange.h
new file mode 100644
index 000000000..256910ef6
--- /dev/null
+++ b/libjava/javax/swing/JTable$AccessibleJTable$AccessibleJTableModelChange.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JTable$AccessibleJTable$AccessibleJTableModelChange__
+#define __javax_swing_JTable$AccessibleJTable$AccessibleJTableModelChange__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JTable$AccessibleJTable;
+        class JTable$AccessibleJTable$AccessibleJTableModelChange;
+    }
+  }
+}
+
+class javax::swing::JTable$AccessibleJTable$AccessibleJTableModelChange : public ::java::lang::Object
+{
+
+public: // actually protected
+  JTable$AccessibleJTable$AccessibleJTableModelChange(::javax::swing::JTable$AccessibleJTable *, jint, jint, jint, jint, jint);
+public:
+  virtual jint getType();
+  virtual jint getFirstRow();
+  virtual jint getLastRow();
+  virtual jint getFirstColumn();
+  virtual jint getLastColumn();
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
+  jint firstRow;
+  jint lastRow;
+  jint firstColumn;
+  jint lastColumn;
+public: // actually package-private
+  ::javax::swing::JTable$AccessibleJTable * this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JTable$AccessibleJTable$AccessibleJTableModelChange__
diff --git a/libjava/javax/swing/JTable$AccessibleJTable$AccessibleTableHeader.h b/libjava/javax/swing/JTable$AccessibleJTable$AccessibleTableHeader.h
new file mode 100644
index 000000000..64e8a5114
--- /dev/null
+++ b/libjava/javax/swing/JTable$AccessibleJTable$AccessibleTableHeader.h
@@ -0,0 +1,70 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JTable$AccessibleJTable$AccessibleTableHeader__
+#define __javax_swing_JTable$AccessibleJTable$AccessibleTableHeader__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+        class AccessibleTable;
+    }
+    namespace swing
+    {
+        class JTable$AccessibleJTable;
+        class JTable$AccessibleJTable$AccessibleTableHeader;
+      namespace table
+      {
+          class JTableHeader;
+      }
+    }
+  }
+}
+
+class javax::swing::JTable$AccessibleJTable$AccessibleTableHeader : public ::java::lang::Object
+{
+
+  JTable$AccessibleJTable$AccessibleTableHeader(::javax::swing::JTable$AccessibleJTable *, ::javax::swing::table::JTableHeader *);
+public:
+  virtual ::javax::accessibility::Accessible * getAccessibleCaption();
+  virtual void setAccessibleCaption(::javax::accessibility::Accessible *);
+  virtual ::javax::accessibility::Accessible * getAccessibleSummary();
+  virtual void setAccessibleSummary(::javax::accessibility::Accessible *);
+  virtual jint getAccessibleRowCount();
+  virtual jint getAccessibleColumnCount();
+  virtual ::javax::accessibility::Accessible * getAccessibleAt(jint, jint);
+  virtual jint getAccessibleRowExtentAt(jint, jint);
+  virtual jint getAccessibleColumnExtentAt(jint, jint);
+  virtual ::javax::accessibility::AccessibleTable * getAccessibleRowHeader();
+  virtual void setAccessibleRowHeader(::javax::accessibility::AccessibleTable *);
+  virtual ::javax::accessibility::AccessibleTable * getAccessibleColumnHeader();
+  virtual void setAccessibleColumnHeader(::javax::accessibility::AccessibleTable *);
+  virtual ::javax::accessibility::Accessible * getAccessibleRowDescription(jint);
+  virtual void setAccessibleRowDescription(jint, ::javax::accessibility::Accessible *);
+  virtual ::javax::accessibility::Accessible * getAccessibleColumnDescription(jint);
+  virtual void setAccessibleColumnDescription(jint, ::javax::accessibility::Accessible *);
+  virtual jboolean isAccessibleSelected(jint, jint);
+  virtual jboolean isAccessibleRowSelected(jint);
+  virtual jboolean isAccessibleColumnSelected(jint);
+  virtual JArray< jint > * getSelectedAccessibleRows();
+  virtual JArray< jint > * getSelectedAccessibleColumns();
+public: // actually package-private
+  JTable$AccessibleJTable$AccessibleTableHeader(::javax::swing::JTable$AccessibleJTable *, ::javax::swing::table::JTableHeader *, ::javax::swing::JTable$AccessibleJTable$AccessibleTableHeader *);
+private:
+  ::javax::swing::table::JTableHeader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) header;
+public: // actually package-private
+  ::javax::swing::JTable$AccessibleJTable * this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JTable$AccessibleJTable$AccessibleTableHeader__
diff --git a/libjava/javax/swing/JTable$AccessibleJTable.h b/libjava/javax/swing/JTable$AccessibleJTable.h
new file mode 100644
index 000000000..71cb86b68
--- /dev/null
+++ b/libjava/javax/swing/JTable$AccessibleJTable.h
@@ -0,0 +1,121 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JTable$AccessibleJTable__
+#define __javax_swing_JTable$AccessibleJTable__
+
+#pragma interface
+
+#include <javax/swing/JComponent$AccessibleJComponent.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+        class AccessibleRole;
+        class AccessibleTable;
+    }
+    namespace swing
+    {
+        class JTable;
+        class JTable$AccessibleJTable;
+      namespace event
+      {
+          class ChangeEvent;
+          class ListSelectionEvent;
+          class TableColumnModelEvent;
+          class TableModelEvent;
+      }
+    }
+  }
+}
+
+class javax::swing::JTable$AccessibleJTable : public ::javax::swing::JComponent$AccessibleJComponent
+{
+
+public: // actually protected
+  JTable$AccessibleJTable(::javax::swing::JTable *);
+public:
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+  virtual ::javax::accessibility::AccessibleTable * getAccessibleTable();
+  virtual jint getAccessibleSelectionCount();
+  virtual ::javax::accessibility::Accessible * getAccessibleSelection(jint);
+  virtual jboolean isAccessibleChildSelected(jint);
+  virtual void addAccessibleSelection(jint);
+  virtual void removeAccessibleSelection(jint);
+  virtual void clearAccessibleSelection();
+  virtual void selectAllAccessibleSelection();
+  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *);
+  virtual void tableChanged(::javax::swing::event::TableModelEvent *);
+  virtual void tableRowsInserted(::javax::swing::event::TableModelEvent *);
+  virtual void tableRowsDeleted(::javax::swing::event::TableModelEvent *);
+private:
+  void handleRowChange(::javax::swing::event::TableModelEvent *);
+public:
+  virtual void columnAdded(::javax::swing::event::TableColumnModelEvent *);
+  virtual void columnRemoved(::javax::swing::event::TableColumnModelEvent *);
+  virtual void columnMoved(::javax::swing::event::TableColumnModelEvent *);
+private:
+  void handleColumnChange(jint, jint, jint);
+public:
+  virtual void columnMarginChanged(::javax::swing::event::ChangeEvent *);
+  virtual void columnSelectionChanged(::javax::swing::event::ListSelectionEvent *);
+  virtual void editingCanceled(::javax::swing::event::ChangeEvent *);
+  virtual void editingStopped(::javax::swing::event::ChangeEvent *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+  virtual jint getAccessibleRow(jint);
+  virtual jint getAccessibleColumn(jint);
+  virtual jint getAccessibleIndex(jint, jint);
+  virtual ::javax::accessibility::Accessible * getAccessibleCaption();
+  virtual void setAccessibleCaption(::javax::accessibility::Accessible *);
+  virtual ::javax::accessibility::Accessible * getAccessibleSummary();
+  virtual void setAccessibleSummary(::javax::accessibility::Accessible *);
+  virtual jint getAccessibleRowCount();
+  virtual jint getAccessibleColumnCount();
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
+  virtual ::javax::accessibility::Accessible * getAccessibleAt(jint, jint);
+  virtual jint getAccessibleRowExtentAt(jint, jint);
+  virtual jint getAccessibleColumnExtentAt(jint, jint);
+  virtual ::javax::accessibility::AccessibleTable * getAccessibleRowHeader();
+  virtual void setAccessibleRowHeader(::javax::accessibility::AccessibleTable *);
+  virtual ::javax::accessibility::AccessibleTable * getAccessibleColumnHeader();
+  virtual void setAccessibleColumnHeader(::javax::accessibility::AccessibleTable *);
+  virtual ::javax::accessibility::Accessible * getAccessibleRowDescription(jint);
+  virtual void setAccessibleRowDescription(jint, ::javax::accessibility::Accessible *);
+  virtual ::javax::accessibility::Accessible * getAccessibleColumnDescription(jint);
+  virtual void setAccessibleColumnDescription(jint, ::javax::accessibility::Accessible *);
+  virtual jboolean isAccessibleSelected(jint, jint);
+  virtual jboolean isAccessibleRowSelected(jint);
+  virtual jboolean isAccessibleColumnSelected(jint);
+  virtual JArray< jint > * getSelectedAccessibleRows();
+  virtual JArray< jint > * getSelectedAccessibleColumns();
+  virtual jint getAccessibleRowAtIndex(jint);
+  virtual jint getAccessibleColumnAtIndex(jint);
+  virtual jint getAccessibleIndexAt(jint, jint);
+public: // actually package-private
+  static ::javax::swing::JTable * access$0(::javax::swing::JTable$AccessibleJTable *);
+private:
+  jint __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) lastSelectedRow;
+  jint lastSelectedColumn;
+  ::javax::accessibility::Accessible * caption;
+  ::javax::accessibility::Accessible * summary;
+  JArray< ::javax::accessibility::Accessible * > * rowDescriptions;
+  JArray< ::javax::accessibility::Accessible * > * columnDescriptions;
+public: // actually package-private
+  ::javax::swing::JTable * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JTable$AccessibleJTable__
diff --git a/libjava/javax/swing/JTable$BooleanCellRenderer.h b/libjava/javax/swing/JTable$BooleanCellRenderer.h
new file mode 100644
index 000000000..127540b10
--- /dev/null
+++ b/libjava/javax/swing/JTable$BooleanCellRenderer.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JTable$BooleanCellRenderer__
+#define __javax_swing_JTable$BooleanCellRenderer__
+
+#pragma interface
+
+#include <javax/swing/table/DefaultTableCellRenderer.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JCheckBox;
+        class JTable;
+        class JTable$BooleanCellRenderer;
+    }
+  }
+}
+
+class javax::swing::JTable$BooleanCellRenderer : public ::javax::swing::table::DefaultTableCellRenderer
+{
+
+public: // actually package-private
+  JTable$BooleanCellRenderer(::javax::swing::JTable *);
+  virtual ::javax::swing::JCheckBox * getCheckBox();
+public:
+  virtual ::java::awt::Component * getTableCellRendererComponent(::javax::swing::JTable *, ::java::lang::Object *, jboolean, jboolean, jint, jint);
+private:
+  ::javax::swing::JCheckBox * __attribute__((aligned(__alignof__( ::javax::swing::table::DefaultTableCellRenderer)))) checkBox;
+public: // actually package-private
+  ::javax::swing::JTable * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JTable$BooleanCellRenderer__
diff --git a/libjava/javax/swing/JTable$DateCellRenderer.h b/libjava/javax/swing/JTable$DateCellRenderer.h
new file mode 100644
index 000000000..854751c30
--- /dev/null
+++ b/libjava/javax/swing/JTable$DateCellRenderer.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JTable$DateCellRenderer__
+#define __javax_swing_JTable$DateCellRenderer__
+
+#pragma interface
+
+#include <javax/swing/table/DefaultTableCellRenderer.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JTable;
+        class JTable$DateCellRenderer;
+    }
+  }
+}
+
+class javax::swing::JTable$DateCellRenderer : public ::javax::swing::table::DefaultTableCellRenderer
+{
+
+  JTable$DateCellRenderer(::javax::swing::JTable *);
+public:
+  virtual ::java::awt::Component * getTableCellRendererComponent(::javax::swing::JTable *, ::java::lang::Object *, jboolean, jboolean, jint, jint);
+public: // actually package-private
+  JTable$DateCellRenderer(::javax::swing::JTable *, ::javax::swing::JTable$DateCellRenderer *);
+  ::javax::swing::JTable * __attribute__((aligned(__alignof__( ::javax::swing::table::DefaultTableCellRenderer)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JTable$DateCellRenderer__
diff --git a/libjava/javax/swing/JTable$DoubleCellRenderer.h b/libjava/javax/swing/JTable$DoubleCellRenderer.h
new file mode 100644
index 000000000..7b3ef733c
--- /dev/null
+++ b/libjava/javax/swing/JTable$DoubleCellRenderer.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JTable$DoubleCellRenderer__
+#define __javax_swing_JTable$DoubleCellRenderer__
+
+#pragma interface
+
+#include <javax/swing/table/DefaultTableCellRenderer.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JTable;
+        class JTable$DoubleCellRenderer;
+    }
+  }
+}
+
+class javax::swing::JTable$DoubleCellRenderer : public ::javax::swing::table::DefaultTableCellRenderer
+{
+
+public:
+  JTable$DoubleCellRenderer(::javax::swing::JTable *);
+  virtual ::java::awt::Component * getTableCellRendererComponent(::javax::swing::JTable *, ::java::lang::Object *, jboolean, jboolean, jint, jint);
+public: // actually package-private
+  ::javax::swing::JTable * __attribute__((aligned(__alignof__( ::javax::swing::table::DefaultTableCellRenderer)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JTable$DoubleCellRenderer__
diff --git a/libjava/javax/swing/JTable$FloatCellRenderer.h b/libjava/javax/swing/JTable$FloatCellRenderer.h
new file mode 100644
index 000000000..b53038046
--- /dev/null
+++ b/libjava/javax/swing/JTable$FloatCellRenderer.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JTable$FloatCellRenderer__
+#define __javax_swing_JTable$FloatCellRenderer__
+
+#pragma interface
+
+#include <javax/swing/table/DefaultTableCellRenderer.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JTable;
+        class JTable$FloatCellRenderer;
+    }
+  }
+}
+
+class javax::swing::JTable$FloatCellRenderer : public ::javax::swing::table::DefaultTableCellRenderer
+{
+
+public:
+  JTable$FloatCellRenderer(::javax::swing::JTable *);
+  virtual ::java::awt::Component * getTableCellRendererComponent(::javax::swing::JTable *, ::java::lang::Object *, jboolean, jboolean, jint, jint);
+public: // actually package-private
+  ::javax::swing::JTable * __attribute__((aligned(__alignof__( ::javax::swing::table::DefaultTableCellRenderer)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JTable$FloatCellRenderer__
diff --git a/libjava/javax/swing/JTable$IconCellRenderer.h b/libjava/javax/swing/JTable$IconCellRenderer.h
new file mode 100644
index 000000000..6b7556658
--- /dev/null
+++ b/libjava/javax/swing/JTable$IconCellRenderer.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JTable$IconCellRenderer__
+#define __javax_swing_JTable$IconCellRenderer__
+
+#pragma interface
+
+#include <javax/swing/table/DefaultTableCellRenderer.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JTable;
+        class JTable$IconCellRenderer;
+    }
+  }
+}
+
+class javax::swing::JTable$IconCellRenderer : public ::javax::swing::table::DefaultTableCellRenderer
+{
+
+public: // actually package-private
+  JTable$IconCellRenderer(::javax::swing::JTable *);
+public:
+  virtual ::java::awt::Component * getTableCellRendererComponent(::javax::swing::JTable *, ::java::lang::Object *, jboolean, jboolean, jint, jint);
+public: // actually package-private
+  ::javax::swing::JTable * __attribute__((aligned(__alignof__( ::javax::swing::table::DefaultTableCellRenderer)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JTable$IconCellRenderer__
diff --git a/libjava/javax/swing/JTable$NumberCellRenderer.h b/libjava/javax/swing/JTable$NumberCellRenderer.h
new file mode 100644
index 000000000..4b5147257
--- /dev/null
+++ b/libjava/javax/swing/JTable$NumberCellRenderer.h
@@ -0,0 +1,33 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JTable$NumberCellRenderer__
+#define __javax_swing_JTable$NumberCellRenderer__
+
+#pragma interface
+
+#include <javax/swing/table/DefaultTableCellRenderer.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JTable;
+        class JTable$NumberCellRenderer;
+    }
+  }
+}
+
+class javax::swing::JTable$NumberCellRenderer : public ::javax::swing::table::DefaultTableCellRenderer
+{
+
+public:
+  JTable$NumberCellRenderer(::javax::swing::JTable *);
+public: // actually package-private
+  ::javax::swing::JTable * __attribute__((aligned(__alignof__( ::javax::swing::table::DefaultTableCellRenderer)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JTable$NumberCellRenderer__
diff --git a/libjava/javax/swing/JTable$TableColumnPropertyChangeHandler.h b/libjava/javax/swing/JTable$TableColumnPropertyChangeHandler.h
new file mode 100644
index 000000000..dc512796b
--- /dev/null
+++ b/libjava/javax/swing/JTable$TableColumnPropertyChangeHandler.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JTable$TableColumnPropertyChangeHandler__
+#define __javax_swing_JTable$TableColumnPropertyChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JTable;
+        class JTable$TableColumnPropertyChangeHandler;
+    }
+  }
+}
+
+class javax::swing::JTable$TableColumnPropertyChangeHandler : public ::java::lang::Object
+{
+
+public: // actually package-private
+  JTable$TableColumnPropertyChangeHandler(::javax::swing::JTable *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::JTable * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JTable$TableColumnPropertyChangeHandler__
diff --git a/libjava/javax/swing/JTable$TableTextField.h b/libjava/javax/swing/JTable$TableTextField.h
new file mode 100644
index 000000000..c0c118f7c
--- /dev/null
+++ b/libjava/javax/swing/JTable$TableTextField.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JTable$TableTextField__
+#define __javax_swing_JTable$TableTextField__
+
+#pragma interface
+
+#include <javax/swing/JTextField.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JTable;
+        class JTable$TableTextField;
+    }
+  }
+}
+
+class javax::swing::JTable$TableTextField : public ::javax::swing::JTextField
+{
+
+public: // actually package-private
+  JTable$TableTextField(::javax::swing::JTable *);
+  ::javax::swing::JTable * __attribute__((aligned(__alignof__( ::javax::swing::JTextField)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JTable$TableTextField__
diff --git a/libjava/javax/swing/JTable.h b/libjava/javax/swing/JTable.h
new file mode 100644
index 000000000..09feb7f22
--- /dev/null
+++ b/libjava/javax/swing/JTable.h
@@ -0,0 +1,294 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JTable__
+#define __javax_swing_JTable__
+
+#pragma interface
+
+#include <javax/swing/JComponent.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Dimension;
+        class Point;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class JScrollPane;
+        class JTable;
+        class JTable$TableColumnPropertyChangeHandler;
+        class ListSelectionModel;
+        class SizeSequence;
+      namespace event
+      {
+          class ChangeEvent;
+          class ListSelectionEvent;
+          class TableColumnModelEvent;
+          class TableModelEvent;
+      }
+      namespace plaf
+      {
+          class TableUI;
+      }
+      namespace table
+      {
+          class JTableHeader;
+          class TableCellEditor;
+          class TableCellRenderer;
+          class TableColumn;
+          class TableColumnModel;
+          class TableModel;
+      }
+    }
+  }
+}
+
+class javax::swing::JTable : public ::javax::swing::JComponent
+{
+
+public:
+  JTable();
+  JTable(jint, jint);
+  JTable(JArray< JArray< ::java::lang::Object * > * > *, JArray< ::java::lang::Object * > *);
+  JTable(::javax::swing::table::TableModel *);
+  JTable(::javax::swing::table::TableModel *, ::javax::swing::table::TableColumnModel *);
+  JTable(::javax::swing::table::TableModel *, ::javax::swing::table::TableColumnModel *, ::javax::swing::ListSelectionModel *);
+  JTable(::java::util::Vector *, ::java::util::Vector *);
+public: // actually protected
+  virtual void initializeLocalVars();
+public:
+  virtual void addColumn(::javax::swing::table::TableColumn *);
+public: // actually protected
+  virtual void createDefaultEditors();
+  virtual void createDefaultRenderers();
+public:
+  static ::javax::swing::JScrollPane * createScrollPaneForTable(::javax::swing::JTable *);
+public: // actually protected
+  virtual ::javax::swing::table::TableColumnModel * createDefaultColumnModel();
+  virtual ::javax::swing::table::TableModel * createDefaultDataModel();
+  virtual ::javax::swing::ListSelectionModel * createDefaultSelectionModel();
+  virtual ::javax::swing::table::JTableHeader * createDefaultTableHeader();
+public:
+  virtual void columnAdded(::javax::swing::event::TableColumnModelEvent *);
+  virtual void columnMarginChanged(::javax::swing::event::ChangeEvent *);
+  virtual void columnMoved(::javax::swing::event::TableColumnModelEvent *);
+  virtual void columnRemoved(::javax::swing::event::TableColumnModelEvent *);
+  virtual void columnSelectionChanged(::javax::swing::event::ListSelectionEvent *);
+  virtual void editingCanceled(::javax::swing::event::ChangeEvent *);
+  virtual void editingStopped(::javax::swing::event::ChangeEvent *);
+  virtual void tableChanged(::javax::swing::event::TableModelEvent *);
+private:
+  void handleCompleteChange(::javax::swing::event::TableModelEvent *);
+  void handleInsert(::javax::swing::event::TableModelEvent *);
+  void handleDelete(::javax::swing::event::TableModelEvent *);
+  void handleUpdate(::javax::swing::event::TableModelEvent *);
+  void checkSelection();
+public:
+  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *);
+  virtual jint columnAtPoint(::java::awt::Point *);
+  virtual jint rowAtPoint(::java::awt::Point *);
+  virtual ::java::awt::Rectangle * getCellRect(jint, jint, jboolean);
+  virtual void clearSelection();
+  virtual jint getSelectedRow();
+  virtual ::javax::swing::ListSelectionModel * getSelectionModel();
+  virtual jint getScrollableBlockIncrement(::java::awt::Rectangle *, jint, jint);
+  virtual jboolean getScrollableTracksViewportHeight();
+  virtual jboolean getScrollableTracksViewportWidth();
+  virtual jint getScrollableUnitIncrement(::java::awt::Rectangle *, jint, jint);
+  virtual ::javax::swing::table::TableCellEditor * getCellEditor(jint, jint);
+  virtual ::javax::swing::table::TableCellEditor * getDefaultEditor(::java::lang::Class *);
+  virtual ::javax::swing::table::TableCellRenderer * getCellRenderer(jint, jint);
+  virtual void setDefaultRenderer(::java::lang::Class *, ::javax::swing::table::TableCellRenderer *);
+  virtual ::javax::swing::table::TableCellRenderer * getDefaultRenderer(::java::lang::Class *);
+  virtual jint convertColumnIndexToModel(jint);
+  virtual jint convertColumnIndexToView(jint);
+  virtual ::java::awt::Component * prepareRenderer(::javax::swing::table::TableCellRenderer *, jint, jint);
+  virtual jboolean getAutoCreateColumnsFromModel();
+  virtual jint getAutoResizeMode();
+  virtual jint getRowHeight();
+  virtual jint getRowHeight(jint);
+  virtual jint getRowMargin();
+  virtual jboolean getRowSelectionAllowed();
+  virtual jboolean getCellSelectionEnabled();
+  virtual ::javax::swing::table::TableModel * getModel();
+  virtual jint getColumnCount();
+  virtual jint getRowCount();
+  virtual ::javax::swing::table::TableColumnModel * getColumnModel();
+  virtual jint getSelectedColumn();
+private:
+  static jint countSelections(::javax::swing::ListSelectionModel *);
+  static JArray< jint > * getSelections(::javax::swing::ListSelectionModel *);
+public:
+  virtual jint getSelectedColumnCount();
+  virtual JArray< jint > * getSelectedColumns();
+  virtual jboolean getColumnSelectionAllowed();
+  virtual jint getSelectedRowCount();
+  virtual JArray< jint > * getSelectedRows();
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+  virtual ::javax::swing::table::TableCellEditor * getCellEditor();
+  virtual jboolean getDragEnabled();
+  virtual ::java::awt::Color * getGridColor();
+  virtual ::java::awt::Dimension * getIntercellSpacing();
+  virtual ::java::awt::Dimension * getPreferredScrollableViewportSize();
+  virtual ::java::awt::Color * getSelectionBackground();
+  virtual ::java::awt::Color * getSelectionForeground();
+  virtual jboolean getShowHorizontalLines();
+  virtual jboolean getShowVerticalLines();
+  virtual ::javax::swing::table::JTableHeader * getTableHeader();
+  virtual void removeColumn(::javax::swing::table::TableColumn *);
+  virtual void moveColumn(jint, jint);
+  virtual void setAutoCreateColumnsFromModel(jboolean);
+  virtual void setAutoResizeMode(jint);
+  virtual void setRowHeight(jint);
+  virtual void setRowHeight(jint, jint);
+  virtual void setRowMargin(jint);
+  virtual void setRowSelectionAllowed(jboolean);
+  virtual void setCellSelectionEnabled(jboolean);
+  virtual void setModel(::javax::swing::table::TableModel *);
+  virtual void setColumnModel(::javax::swing::table::TableColumnModel *);
+  virtual void setColumnSelectionAllowed(jboolean);
+  virtual void setSelectionModel(::javax::swing::ListSelectionModel *);
+  virtual void setSelectionMode(jint);
+  virtual void setCellEditor(::javax::swing::table::TableCellEditor *);
+  virtual void setDragEnabled(jboolean);
+  virtual void setGridColor(::java::awt::Color *);
+  virtual void setIntercellSpacing(::java::awt::Dimension *);
+  virtual void setPreferredScrollableViewportSize(::java::awt::Dimension *);
+  virtual void setSelectionBackground(::java::awt::Color *);
+  virtual void setSelectionForeground(::java::awt::Color *);
+  virtual void setShowGrid(jboolean);
+  virtual void setShowHorizontalLines(jboolean);
+  virtual void setShowVerticalLines(jboolean);
+  virtual void setTableHeader(::javax::swing::table::JTableHeader *);
+public: // actually protected
+  virtual void configureEnclosingScrollPane();
+  virtual void unconfigureEnclosingScrollPane();
+public:
+  virtual void addNotify();
+  virtual void removeNotify();
+private:
+  void distributeSpill(JArray< ::javax::swing::table::TableColumn * > *, jint);
+  void distributeSpillResizing(JArray< ::javax::swing::table::TableColumn * > *, jint, ::javax::swing::table::TableColumn *);
+public:
+  virtual void doLayout();
+public: // actually package-private
+  virtual jint getLeftResizingBoundary();
+public:
+  virtual void sizeColumnsToFit(jboolean);
+  virtual void sizeColumnsToFit(jint);
+  virtual ::java::lang::String * getUIClassID();
+  virtual ::javax::swing::plaf::TableUI * getUI();
+  virtual void setUI(::javax::swing::plaf::TableUI *);
+  virtual void updateUI();
+  virtual ::java::lang::Class * getColumnClass(jint);
+  virtual ::java::lang::String * getColumnName(jint);
+  virtual jint getEditingColumn();
+  virtual void setEditingColumn(jint);
+  virtual jint getEditingRow();
+  virtual void setEditingRow(jint);
+  virtual ::java::awt::Component * getEditorComponent();
+  virtual jboolean isEditing();
+  virtual void setDefaultEditor(::java::lang::Class *, ::javax::swing::table::TableCellEditor *);
+  virtual void addColumnSelectionInterval(jint, jint);
+  virtual void addRowSelectionInterval(jint, jint);
+  virtual void setColumnSelectionInterval(jint, jint);
+  virtual void setRowSelectionInterval(jint, jint);
+  virtual void removeColumnSelectionInterval(jint, jint);
+  virtual void removeRowSelectionInterval(jint, jint);
+  virtual jboolean isColumnSelected(jint);
+  virtual jboolean isRowSelected(jint);
+  virtual jboolean isCellSelected(jint, jint);
+  virtual void selectAll();
+  virtual ::java::lang::Object * getValueAt(jint, jint);
+  virtual void setValueAt(::java::lang::Object *, jint, jint);
+  virtual ::javax::swing::table::TableColumn * getColumn(::java::lang::Object *);
+  virtual jboolean isCellEditable(jint, jint);
+  virtual void createDefaultColumnsFromModel();
+  virtual void changeSelection(jint, jint, jboolean, jboolean);
+  virtual jboolean editCellAt(jint, jint);
+private:
+  void moveToCellBeingEdited(::java::awt::Component *);
+public:
+  virtual jboolean editCellAt(jint, jint, ::java::util::EventObject *);
+  virtual void removeEditor();
+  virtual ::java::awt::Component * prepareEditor(::javax::swing::table::TableCellEditor *, jint, jint);
+public: // actually protected
+  virtual void resizeAndRepaint();
+public:
+  virtual void setSurrendersFocusOnKeystroke(jboolean);
+  virtual jboolean getSurrendersFocusOnKeystroke();
+public: // actually package-private
+  virtual void setUIProperty(::java::lang::String *, ::java::lang::Object *);
+private:
+  static const jlong serialVersionUID = 3876025080382781659LL;
+public: // actually package-private
+  ::javax::swing::JTable * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) this_table;
+public:
+  static const jint AUTO_RESIZE_OFF = 0;
+  static const jint AUTO_RESIZE_NEXT_COLUMN = 1;
+  static const jint AUTO_RESIZE_SUBSEQUENT_COLUMNS = 2;
+  static const jint AUTO_RESIZE_ALL_COLUMNS = 4;
+  static const jint AUTO_RESIZE_LAST_COLUMN = 3;
+public: // actually protected
+  ::java::util::Hashtable * defaultEditorsByColumnClass;
+  ::java::util::Hashtable * defaultRenderersByColumnClass;
+  jint editingColumn;
+  jint editingRow;
+  ::java::awt::Component * editorComp;
+  jboolean autoCreateColumnsFromModel;
+  jint autoResizeMode;
+  jint rowHeight;
+  jint rowMargin;
+  jboolean rowSelectionAllowed;
+  jboolean cellSelectionEnabled;
+  ::javax::swing::table::TableModel * dataModel;
+  ::javax::swing::table::TableColumnModel * columnModel;
+  ::javax::swing::ListSelectionModel * selectionModel;
+  ::javax::swing::table::TableCellEditor * cellEditor;
+private:
+  jboolean dragEnabled;
+public: // actually protected
+  ::java::awt::Color * gridColor;
+  ::java::awt::Dimension * preferredViewportSize;
+  ::java::awt::Color * selectionBackground;
+private:
+  static ::java::lang::String * SELECTION_BACKGROUND_CHANGED_PROPERTY;
+public: // actually protected
+  ::java::awt::Color * selectionForeground;
+private:
+  static ::java::lang::String * SELECTION_FOREGROUND_CHANGED_PROPERTY;
+public: // actually protected
+  jboolean showHorizontalLines;
+  jboolean showVerticalLines;
+  ::javax::swing::table::JTableHeader * tableHeader;
+public: // actually package-private
+  ::javax::swing::JTable$TableColumnPropertyChangeHandler * tableColumnPropertyChangeHandler;
+private:
+  jboolean surrendersFocusOnKeystroke;
+  ::java::awt::Rectangle * rectCache;
+  jboolean clientRowHeightSet;
+  ::javax::swing::SizeSequence * rowHeights;
+  ::javax::swing::table::TableCellEditor * booleanInvertingEditor;
+public: // actually package-private
+  static jboolean $assertionsDisabled;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JTable__
diff --git a/libjava/javax/swing/JTextArea$AccessibleJTextArea.h b/libjava/javax/swing/JTextArea$AccessibleJTextArea.h
new file mode 100644
index 000000000..57d5b20fc
--- /dev/null
+++ b/libjava/javax/swing/JTextArea$AccessibleJTextArea.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JTextArea$AccessibleJTextArea__
+#define __javax_swing_JTextArea$AccessibleJTextArea__
+
+#pragma interface
+
+#include <javax/swing/text/JTextComponent$AccessibleJTextComponent.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleStateSet;
+    }
+    namespace swing
+    {
+        class JTextArea;
+        class JTextArea$AccessibleJTextArea;
+    }
+  }
+}
+
+class javax::swing::JTextArea$AccessibleJTextArea : public ::javax::swing::text::JTextComponent$AccessibleJTextComponent
+{
+
+public: // actually protected
+  JTextArea$AccessibleJTextArea(::javax::swing::JTextArea *);
+public:
+  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
+public: // actually package-private
+  ::javax::swing::JTextArea * __attribute__((aligned(__alignof__( ::javax::swing::text::JTextComponent$AccessibleJTextComponent)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JTextArea$AccessibleJTextArea__
diff --git a/libjava/javax/swing/JTextArea.h b/libjava/javax/swing/JTextArea.h
new file mode 100644
index 000000000..c5248b94b
--- /dev/null
+++ b/libjava/javax/swing/JTextArea.h
@@ -0,0 +1,90 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JTextArea__
+#define __javax_swing_JTextArea__
+
+#pragma interface
+
+#include <javax/swing/text/JTextComponent.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class JTextArea;
+      namespace text
+      {
+          class Document;
+      }
+    }
+  }
+}
+
+class javax::swing::JTextArea : public ::javax::swing::text::JTextComponent
+{
+
+public:
+  JTextArea();
+  JTextArea(::java::lang::String *);
+  JTextArea(jint, jint);
+  JTextArea(::java::lang::String *, jint, jint);
+  JTextArea(::javax::swing::text::Document *);
+  JTextArea(::javax::swing::text::Document *, ::java::lang::String *, jint, jint);
+  virtual void append(::java::lang::String *);
+public: // actually protected
+  virtual ::javax::swing::text::Document * createDefaultModel();
+public:
+  virtual jboolean getScrollableTracksViewportWidth();
+  virtual jint getScrollableUnitIncrement(::java::awt::Rectangle *, jint, jint);
+  virtual ::java::awt::Dimension * getPreferredScrollableViewportSize();
+  virtual ::java::lang::String * getUIClassID();
+  virtual jint getColumns();
+  virtual void setColumns(jint);
+  virtual jint getRows();
+  virtual void setRows(jint);
+  virtual jboolean getLineWrap();
+  virtual void setLineWrap(jboolean);
+  virtual jboolean getWrapStyleWord();
+  virtual void setWrapStyleWord(jboolean);
+  virtual jint getTabSize();
+  virtual void setTabSize(jint);
+public: // actually protected
+  virtual jint getColumnWidth();
+public:
+  virtual jint getLineCount();
+  virtual jint getLineStartOffset(jint);
+  virtual jint getLineEndOffset(jint);
+  virtual jint getLineOfOffset(jint);
+public: // actually protected
+  virtual jint getRowHeight();
+public:
+  virtual void insert(::java::lang::String *, jint);
+  virtual void replaceRange(::java::lang::String *, jint, jint);
+  virtual ::java::awt::Dimension * getPreferredSize();
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+private:
+  static const jlong serialVersionUID = -6141680179310439825LL;
+  jint __attribute__((aligned(__alignof__( ::javax::swing::text::JTextComponent)))) rows;
+  jint columns;
+  jboolean lineWrap;
+  jint tabSize;
+  jboolean wrapStyleWord;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JTextArea__
diff --git a/libjava/javax/swing/JTextField$1.h b/libjava/javax/swing/JTextField$1.h
new file mode 100644
index 000000000..8e2220f21
--- /dev/null
+++ b/libjava/javax/swing/JTextField$1.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JTextField$1__
+#define __javax_swing_JTextField$1__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JTextField$1;
+    }
+  }
+}
+
+class javax::swing::JTextField$1 : public ::javax::swing::text::TextAction
+{
+
+public: // actually package-private
+  JTextField$1(::java::lang::String *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JTextField$1__
diff --git a/libjava/javax/swing/JTextField$2.h b/libjava/javax/swing/JTextField$2.h
new file mode 100644
index 000000000..b8587d17c
--- /dev/null
+++ b/libjava/javax/swing/JTextField$2.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JTextField$2__
+#define __javax_swing_JTextField$2__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JTextField;
+        class JTextField$2;
+    }
+  }
+}
+
+class javax::swing::JTextField$2 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  JTextField$2(::javax::swing::JTextField *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::JTextField * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JTextField$2__
diff --git a/libjava/javax/swing/JTextField$AccessibleJTextField.h b/libjava/javax/swing/JTextField$AccessibleJTextField.h
new file mode 100644
index 000000000..403fcae20
--- /dev/null
+++ b/libjava/javax/swing/JTextField$AccessibleJTextField.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JTextField$AccessibleJTextField__
+#define __javax_swing_JTextField$AccessibleJTextField__
+
+#pragma interface
+
+#include <javax/swing/text/JTextComponent$AccessibleJTextComponent.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleStateSet;
+    }
+    namespace swing
+    {
+        class JTextField;
+        class JTextField$AccessibleJTextField;
+    }
+  }
+}
+
+class javax::swing::JTextField$AccessibleJTextField : public ::javax::swing::text::JTextComponent$AccessibleJTextComponent
+{
+
+public: // actually protected
+  JTextField$AccessibleJTextField(::javax::swing::JTextField *);
+public:
+  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
+private:
+  static const jlong serialVersionUID = 8255147276740453036LL;
+public: // actually package-private
+  ::javax::swing::JTextField * __attribute__((aligned(__alignof__( ::javax::swing::text::JTextComponent$AccessibleJTextComponent)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JTextField$AccessibleJTextField__
diff --git a/libjava/javax/swing/JTextField.h b/libjava/javax/swing/JTextField.h
new file mode 100644
index 000000000..de4ed3ab8
--- /dev/null
+++ b/libjava/javax/swing/JTextField.h
@@ -0,0 +1,108 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JTextField__
+#define __javax_swing_JTextField__
+
+#pragma interface
+
+#include <javax/swing/text/JTextComponent.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Font;
+        class Rectangle;
+      namespace event
+      {
+          class ActionListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class Action;
+        class BoundedRangeModel;
+        class JTextField;
+      namespace text
+      {
+          class Document;
+      }
+    }
+  }
+}
+
+class javax::swing::JTextField : public ::javax::swing::text::JTextComponent
+{
+
+public:
+  JTextField();
+  JTextField(::java::lang::String *);
+  JTextField(jint);
+  JTextField(::java::lang::String *, jint);
+  JTextField(::javax::swing::text::Document *, ::java::lang::String *, jint);
+public: // actually protected
+  virtual ::javax::swing::text::Document * createDefaultModel();
+public:
+  virtual void setDocument(::javax::swing::text::Document *);
+  virtual ::java::lang::String * getUIClassID();
+  virtual void addActionListener(::java::awt::event::ActionListener *);
+  virtual void removeActionListener(::java::awt::event::ActionListener *);
+  virtual JArray< ::java::awt::event::ActionListener * > * getActionListeners();
+public: // actually protected
+  virtual void fireActionPerformed();
+public:
+  virtual jint getColumns();
+  virtual void setColumns(jint);
+  virtual jint getHorizontalAlignment();
+  virtual void setHorizontalAlignment(jint);
+  virtual void setFont(::java::awt::Font *);
+  virtual ::java::awt::Dimension * getPreferredSize();
+  virtual jint getScrollOffset();
+  virtual void setScrollOffset(jint);
+  virtual JArray< ::javax::swing::Action * > * getActions();
+  virtual void postActionEvent();
+  virtual ::javax::swing::Action * getAction();
+  virtual void setAction(::javax::swing::Action *);
+  virtual void setActionCommand(::java::lang::String *);
+public: // actually protected
+  virtual ::java::beans::PropertyChangeListener * createActionPropertyChangeListener(::javax::swing::Action *);
+  virtual void configurePropertiesFromAction(::javax::swing::Action *);
+  virtual jint getColumnWidth();
+public:
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+  virtual ::javax::swing::BoundedRangeModel * getHorizontalVisibility();
+  virtual jboolean isValidateRoot();
+  virtual void scrollRectToVisible(::java::awt::Rectangle *);
+private:
+  static const jlong serialVersionUID = 353853209832607592LL;
+  static JArray< ::javax::swing::Action * > * actions;
+public:
+  static ::java::lang::String * notifyAction;
+private:
+  jint __attribute__((aligned(__alignof__( ::javax::swing::text::JTextComponent)))) columns;
+  jint align;
+  ::javax::swing::Action * action;
+  ::java::lang::String * actionCommand;
+  ::java::beans::PropertyChangeListener * actionPropertyChangeListener;
+  ::javax::swing::BoundedRangeModel * horizontalVisibility;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JTextField__
diff --git a/libjava/javax/swing/JTextPane.h b/libjava/javax/swing/JTextPane.h
new file mode 100644
index 000000000..dcc6f7da7
--- /dev/null
+++ b/libjava/javax/swing/JTextPane.h
@@ -0,0 +1,73 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JTextPane__
+#define __javax_swing_JTextPane__
+
+#pragma interface
+
+#include <javax/swing/JEditorPane.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+        class JTextPane;
+      namespace text
+      {
+          class AttributeSet;
+          class Document;
+          class EditorKit;
+          class MutableAttributeSet;
+          class Style;
+          class StyledDocument;
+          class StyledEditorKit;
+      }
+    }
+  }
+}
+
+class javax::swing::JTextPane : public ::javax::swing::JEditorPane
+{
+
+public:
+  JTextPane();
+  JTextPane(::javax::swing::text::StyledDocument *);
+  virtual ::java::lang::String * getUIClassID();
+  virtual void setDocument(::javax::swing::text::Document *);
+  virtual ::javax::swing::text::StyledDocument * getStyledDocument();
+  virtual void setStyledDocument(::javax::swing::text::StyledDocument *);
+  virtual void replaceSelection(::java::lang::String *);
+  virtual void insertComponent(::java::awt::Component *);
+  virtual void insertIcon(::javax::swing::Icon *);
+  virtual ::javax::swing::text::Style * addStyle(::java::lang::String *, ::javax::swing::text::Style *);
+  virtual void removeStyle(::java::lang::String *);
+  virtual ::javax::swing::text::Style * getStyle(::java::lang::String *);
+  virtual ::javax::swing::text::Style * getLogicalStyle();
+  virtual void setLogicalStyle(::javax::swing::text::Style *);
+  virtual ::javax::swing::text::AttributeSet * getCharacterAttributes();
+  virtual void setCharacterAttributes(::javax::swing::text::AttributeSet *, jboolean);
+  virtual ::javax::swing::text::AttributeSet * getParagraphAttributes();
+  virtual void setParagraphAttributes(::javax::swing::text::AttributeSet *, jboolean);
+  virtual ::javax::swing::text::MutableAttributeSet * getInputAttributes();
+public: // actually protected
+  virtual ::javax::swing::text::StyledEditorKit * getStyledEditorKit();
+  virtual ::javax::swing::text::EditorKit * createDefaultEditorKit();
+public:
+  virtual void setEditorKit(::javax::swing::text::EditorKit *);
+public: // actually protected
+  virtual ::java::lang::String * paramString();
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JTextPane__
diff --git a/libjava/javax/swing/JToggleButton$AccessibleJToggleButton.h b/libjava/javax/swing/JToggleButton$AccessibleJToggleButton.h
new file mode 100644
index 000000000..a1f01f337
--- /dev/null
+++ b/libjava/javax/swing/JToggleButton$AccessibleJToggleButton.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JToggleButton$AccessibleJToggleButton__
+#define __javax_swing_JToggleButton$AccessibleJToggleButton__
+
+#pragma interface
+
+#include <javax/swing/AbstractButton$AccessibleAbstractButton.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ItemEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleRole;
+    }
+    namespace swing
+    {
+        class JToggleButton;
+        class JToggleButton$AccessibleJToggleButton;
+    }
+  }
+}
+
+class javax::swing::JToggleButton$AccessibleJToggleButton : public ::javax::swing::AbstractButton$AccessibleAbstractButton
+{
+
+public:
+  JToggleButton$AccessibleJToggleButton(::javax::swing::JToggleButton *);
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+  virtual void itemStateChanged(::java::awt::event::ItemEvent *);
+private:
+  static const jlong serialVersionUID = -8652952712161229225LL;
+public: // actually package-private
+  ::javax::swing::JToggleButton * __attribute__((aligned(__alignof__( ::javax::swing::AbstractButton$AccessibleAbstractButton)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JToggleButton$AccessibleJToggleButton__
diff --git a/libjava/javax/swing/JToggleButton$ToggleButtonModel.h b/libjava/javax/swing/JToggleButton$ToggleButtonModel.h
new file mode 100644
index 000000000..a8d3c2259
--- /dev/null
+++ b/libjava/javax/swing/JToggleButton$ToggleButtonModel.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JToggleButton$ToggleButtonModel__
+#define __javax_swing_JToggleButton$ToggleButtonModel__
+
+#pragma interface
+
+#include <javax/swing/DefaultButtonModel.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JToggleButton$ToggleButtonModel;
+    }
+  }
+}
+
+class javax::swing::JToggleButton$ToggleButtonModel : public ::javax::swing::DefaultButtonModel
+{
+
+public:
+  JToggleButton$ToggleButtonModel();
+  virtual void setPressed(jboolean);
+  virtual jboolean isSelected();
+  virtual void setSelected(jboolean);
+private:
+  static const jlong serialVersionUID = -1589950750899943974LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JToggleButton$ToggleButtonModel__
diff --git a/libjava/javax/swing/JToggleButton.h b/libjava/javax/swing/JToggleButton.h
new file mode 100644
index 000000000..88f281ac5
--- /dev/null
+++ b/libjava/javax/swing/JToggleButton.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JToggleButton__
+#define __javax_swing_JToggleButton__
+
+#pragma interface
+
+#include <javax/swing/AbstractButton.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class Action;
+        class Icon;
+        class JToggleButton;
+    }
+  }
+}
+
+class javax::swing::JToggleButton : public ::javax::swing::AbstractButton
+{
+
+public:
+  JToggleButton();
+  JToggleButton(::javax::swing::Action *);
+  JToggleButton(::javax::swing::Icon *);
+  JToggleButton(::javax::swing::Icon *, jboolean);
+  JToggleButton(::java::lang::String *);
+  JToggleButton(::java::lang::String *, jboolean);
+  JToggleButton(::java::lang::String *, ::javax::swing::Icon *);
+  JToggleButton(::java::lang::String *, ::javax::swing::Icon *, jboolean);
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+  virtual ::java::lang::String * getUIClassID();
+public: // actually protected
+  virtual ::java::lang::String * paramString();
+public:
+  virtual void updateUI();
+private:
+  static const jlong serialVersionUID = -3128248873429850443LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JToggleButton__
diff --git a/libjava/javax/swing/JToolBar$AccessibleJToolBar.h b/libjava/javax/swing/JToolBar$AccessibleJToolBar.h
new file mode 100644
index 000000000..0474a4e91
--- /dev/null
+++ b/libjava/javax/swing/JToolBar$AccessibleJToolBar.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JToolBar$AccessibleJToolBar__
+#define __javax_swing_JToolBar$AccessibleJToolBar__
+
+#pragma interface
+
+#include <javax/swing/JComponent$AccessibleJComponent.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleRole;
+        class AccessibleStateSet;
+    }
+    namespace swing
+    {
+        class JToolBar;
+        class JToolBar$AccessibleJToolBar;
+    }
+  }
+}
+
+class javax::swing::JToolBar$AccessibleJToolBar : public ::javax::swing::JComponent$AccessibleJComponent
+{
+
+public: // actually protected
+  JToolBar$AccessibleJToolBar(::javax::swing::JToolBar *);
+public:
+  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+private:
+  static const jlong serialVersionUID = -5516888265903814215LL;
+public: // actually package-private
+  ::javax::swing::JToolBar * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JToolBar$AccessibleJToolBar__
diff --git a/libjava/javax/swing/JToolBar$DefaultToolBarLayout.h b/libjava/javax/swing/JToolBar$DefaultToolBarLayout.h
new file mode 100644
index 000000000..ba7d9cc52
--- /dev/null
+++ b/libjava/javax/swing/JToolBar$DefaultToolBarLayout.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JToolBar$DefaultToolBarLayout__
+#define __javax_swing_JToolBar$DefaultToolBarLayout__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JToolBar;
+        class JToolBar$DefaultToolBarLayout;
+    }
+  }
+}
+
+class javax::swing::JToolBar$DefaultToolBarLayout : public ::java::lang::Object
+{
+
+  JToolBar$DefaultToolBarLayout(::javax::swing::JToolBar *);
+public:
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+  virtual void layoutContainer(::java::awt::Container *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  virtual void removeLayoutComponent(::java::awt::Component *);
+public: // actually package-private
+  JToolBar$DefaultToolBarLayout(::javax::swing::JToolBar *, ::javax::swing::JToolBar$DefaultToolBarLayout *);
+  ::javax::swing::JToolBar * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JToolBar$DefaultToolBarLayout__
diff --git a/libjava/javax/swing/JToolBar$Separator.h b/libjava/javax/swing/JToolBar$Separator.h
new file mode 100644
index 000000000..a30fc4e27
--- /dev/null
+++ b/libjava/javax/swing/JToolBar$Separator.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JToolBar$Separator__
+#define __javax_swing_JToolBar$Separator__
+
+#pragma interface
+
+#include <javax/swing/JSeparator.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JToolBar$Separator;
+    }
+  }
+}
+
+class javax::swing::JToolBar$Separator : public ::javax::swing::JSeparator
+{
+
+public:
+  JToolBar$Separator();
+  JToolBar$Separator(::java::awt::Dimension *);
+  virtual ::java::lang::String * getUIClassID();
+  virtual ::java::awt::Dimension * getPreferredSize();
+  virtual ::java::awt::Dimension * getMaximumSize();
+  virtual ::java::awt::Dimension * getMinimumSize();
+  virtual ::java::awt::Dimension * getSeparatorSize();
+  virtual void setSeparatorSize(::java::awt::Dimension *);
+private:
+  static const jlong serialVersionUID = -1656745644823105219LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JToolBar$Separator__
diff --git a/libjava/javax/swing/JToolBar.h b/libjava/javax/swing/JToolBar.h
new file mode 100644
index 000000000..ea7cd99b2
--- /dev/null
+++ b/libjava/javax/swing/JToolBar.h
@@ -0,0 +1,95 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JToolBar__
+#define __javax_swing_JToolBar__
+
+#pragma interface
+
+#include <javax/swing/JComponent.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Dimension;
+        class Graphics;
+        class Insets;
+        class LayoutManager;
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class Action;
+        class JButton;
+        class JToolBar;
+      namespace plaf
+      {
+          class ToolBarUI;
+      }
+    }
+  }
+}
+
+class javax::swing::JToolBar : public ::javax::swing::JComponent
+{
+
+public:
+  JToolBar();
+  JToolBar(jint);
+  JToolBar(::java::lang::String *);
+  JToolBar(::java::lang::String *, jint);
+  virtual ::javax::swing::JButton * add(::javax::swing::Action *);
+public: // actually protected
+  virtual void paintBorder(::java::awt::Graphics *);
+public:
+  virtual ::javax::swing::plaf::ToolBarUI * getUI();
+  virtual void setUI(::javax::swing::plaf::ToolBarUI *);
+  virtual void updateUI();
+  virtual ::java::lang::String * getUIClassID();
+  virtual void setRollover(jboolean);
+  virtual jboolean isRollover();
+  virtual jint getComponentIndex(::java::awt::Component *);
+  virtual ::java::awt::Component * getComponentAtIndex(jint);
+  virtual ::java::awt::Insets * getMargin();
+  virtual void setMargin(::java::awt::Insets *);
+  virtual jboolean isBorderPainted();
+  virtual void setBorderPainted(jboolean);
+  virtual jboolean isFloatable();
+  virtual void setFloatable(jboolean);
+  virtual jint getOrientation();
+  virtual void setLayout(::java::awt::LayoutManager *);
+  virtual void setOrientation(jint);
+  virtual void addSeparator();
+  virtual void addSeparator(::java::awt::Dimension *);
+public: // actually protected
+  virtual ::javax::swing::JButton * createActionComponent(::javax::swing::Action *);
+  virtual ::java::beans::PropertyChangeListener * createActionChangeListener(::javax::swing::JButton *);
+  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
+  virtual ::java::lang::String * paramString();
+public:
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+private:
+  static const jlong serialVersionUID = -1269915519555129643LL;
+  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) paintBorder__;
+  ::java::awt::Insets * margin;
+  jboolean floatable;
+  jboolean rollover;
+  jint orientation;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JToolBar__
diff --git a/libjava/javax/swing/JToolTip$AccessibleJToolTip.h b/libjava/javax/swing/JToolTip$AccessibleJToolTip.h
new file mode 100644
index 000000000..f65575e8a
--- /dev/null
+++ b/libjava/javax/swing/JToolTip$AccessibleJToolTip.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JToolTip$AccessibleJToolTip__
+#define __javax_swing_JToolTip$AccessibleJToolTip__
+
+#pragma interface
+
+#include <javax/swing/JComponent$AccessibleJComponent.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleRole;
+    }
+    namespace swing
+    {
+        class JToolTip;
+        class JToolTip$AccessibleJToolTip;
+    }
+  }
+}
+
+class javax::swing::JToolTip$AccessibleJToolTip : public ::javax::swing::JComponent$AccessibleJComponent
+{
+
+public: // actually protected
+  JToolTip$AccessibleJToolTip(::javax::swing::JToolTip *);
+public:
+  virtual ::java::lang::String * getAccessibleDescription();
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+private:
+  static const jlong serialVersionUID = -6222548177795408476LL;
+public: // actually package-private
+  ::javax::swing::JToolTip * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JToolTip$AccessibleJToolTip__
diff --git a/libjava/javax/swing/JToolTip.h b/libjava/javax/swing/JToolTip.h
new file mode 100644
index 000000000..d622528f0
--- /dev/null
+++ b/libjava/javax/swing/JToolTip.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JToolTip__
+#define __javax_swing_JToolTip__
+
+#pragma interface
+
+#include <javax/swing/JComponent.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class JComponent;
+        class JToolTip;
+      namespace plaf
+      {
+          class ToolTipUI;
+      }
+    }
+  }
+}
+
+class javax::swing::JToolTip : public ::javax::swing::JComponent
+{
+
+public:
+  JToolTip();
+  virtual ::java::lang::String * getTipText();
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+  virtual ::javax::swing::JComponent * getComponent();
+  virtual ::javax::swing::plaf::ToolTipUI * getUI();
+  virtual ::java::lang::String * getUIClassID();
+public: // actually protected
+  virtual ::java::lang::String * paramString();
+public:
+  virtual void setComponent(::javax::swing::JComponent *);
+  virtual void setTipText(::java::lang::String *);
+  virtual void updateUI();
+public: // actually package-private
+  virtual jboolean onTop();
+private:
+  static const jlong serialVersionUID = -1138929898906751643LL;
+public: // actually package-private
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) text;
+  ::javax::swing::JComponent * component;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JToolTip__
diff --git a/libjava/javax/swing/JTree$AccessibleJTree$AccessibleJTreeNode.h b/libjava/javax/swing/JTree$AccessibleJTree$AccessibleJTreeNode.h
new file mode 100644
index 000000000..40d1f9770
--- /dev/null
+++ b/libjava/javax/swing/JTree$AccessibleJTree$AccessibleJTreeNode.h
@@ -0,0 +1,140 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JTree$AccessibleJTree$AccessibleJTreeNode__
+#define __javax_swing_JTree$AccessibleJTree$AccessibleJTreeNode__
+
+#pragma interface
+
+#include <javax/accessibility/AccessibleContext.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Cursor;
+        class Dimension;
+        class Font;
+        class FontMetrics;
+        class Point;
+        class Rectangle;
+      namespace event
+      {
+          class FocusListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+        class AccessibleAction;
+        class AccessibleComponent;
+        class AccessibleContext;
+        class AccessibleRole;
+        class AccessibleSelection;
+        class AccessibleStateSet;
+        class AccessibleText;
+        class AccessibleValue;
+    }
+    namespace swing
+    {
+        class JTree;
+        class JTree$AccessibleJTree;
+        class JTree$AccessibleJTree$AccessibleJTreeNode;
+      namespace tree
+      {
+          class TreeModel;
+          class TreePath;
+      }
+    }
+  }
+}
+
+class javax::swing::JTree$AccessibleJTree$AccessibleJTreeNode : public ::javax::accessibility::AccessibleContext
+{
+
+public:
+  JTree$AccessibleJTree$AccessibleJTreeNode(::javax::swing::JTree$AccessibleJTree *, ::javax::swing::JTree *, ::javax::swing::tree::TreePath *, ::javax::accessibility::Accessible *);
+  virtual void addAccessibleSelection(jint);
+  virtual void addFocusListener(::java::awt::event::FocusListener *);
+  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
+  virtual void clearAccessibleSelection();
+  virtual jboolean contains(::java::awt::Point *);
+  virtual jboolean doAccessibleAction(jint);
+  virtual ::javax::accessibility::AccessibleAction * getAccessibleAction();
+  virtual jint getAccessibleActionCount();
+  virtual ::java::lang::String * getAccessibleActionDescription(jint);
+  virtual ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Point *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
+  virtual jint getAccessibleChildrenCount();
+  virtual ::javax::accessibility::AccessibleComponent * getAccessibleComponent();
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+  virtual ::java::lang::String * getAccessibleDescription();
+  virtual jint getAccessibleIndexInParent();
+  virtual ::java::lang::String * getAccessibleName();
+  virtual ::javax::accessibility::Accessible * getAccessibleParent();
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+  virtual ::javax::accessibility::AccessibleSelection * getAccessibleSelection();
+  virtual ::javax::accessibility::Accessible * getAccessibleSelection(jint);
+  virtual jint getAccessibleSelectionCount();
+  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
+  virtual ::javax::accessibility::AccessibleText * getAccessibleText();
+  virtual ::javax::accessibility::AccessibleValue * getAccessibleValue();
+  virtual ::java::awt::Color * getBackground();
+  virtual ::java::awt::Rectangle * getBounds();
+  virtual ::java::awt::Cursor * getCursor();
+  virtual ::java::awt::Font * getFont();
+  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
+  virtual ::java::awt::Color * getForeground();
+  virtual ::java::util::Locale * getLocale();
+  virtual ::java::awt::Point * getLocation();
+public: // actually protected
+  virtual ::java::awt::Point * getLocationInJTree();
+public:
+  virtual ::java::awt::Point * getLocationOnScreen();
+  virtual ::java::awt::Dimension * getSize();
+  virtual jboolean isAccessibleChildSelected(jint);
+  virtual jboolean isEnabled();
+  virtual jboolean isFocusTraversable();
+  virtual jboolean isShowing();
+  virtual jboolean isVisible();
+  virtual void removeAccessibleSelection(jint);
+  virtual void removeFocusListener(::java::awt::event::FocusListener *);
+  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
+  virtual void requestFocus();
+  virtual void selectAllAccessibleSelection();
+  virtual void setAccessibleDescription(::java::lang::String *);
+  virtual void setAccessibleName(::java::lang::String *);
+  virtual void setBackground(::java::awt::Color *);
+  virtual void setBounds(::java::awt::Rectangle *);
+  virtual void setCursor(::java::awt::Cursor *);
+  virtual void setEnabled(jboolean);
+  virtual void setFont(::java::awt::Font *);
+  virtual void setForeground(::java::awt::Color *);
+  virtual void setLocation(::java::awt::Point *);
+  virtual void setSize(::java::awt::Dimension *);
+  virtual void setVisible(jboolean);
+private:
+  ::javax::swing::JTree * __attribute__((aligned(__alignof__( ::javax::accessibility::AccessibleContext)))) tree;
+  ::javax::swing::tree::TreePath * tp;
+  ::javax::accessibility::Accessible * acc;
+  ::javax::accessibility::AccessibleStateSet * states;
+  ::java::util::Vector * selectionList;
+  ::java::util::Vector * actionList;
+  ::javax::swing::tree::TreeModel * mod;
+  ::java::awt::Cursor * cursor;
+public: // actually package-private
+  ::javax::swing::JTree$AccessibleJTree * this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JTree$AccessibleJTree$AccessibleJTreeNode__
diff --git a/libjava/javax/swing/JTree$AccessibleJTree.h b/libjava/javax/swing/JTree$AccessibleJTree.h
new file mode 100644
index 000000000..e4b60e1e1
--- /dev/null
+++ b/libjava/javax/swing/JTree$AccessibleJTree.h
@@ -0,0 +1,74 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JTree$AccessibleJTree__
+#define __javax_swing_JTree$AccessibleJTree__
+
+#pragma interface
+
+#include <javax/swing/JComponent$AccessibleJComponent.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Point;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+        class AccessibleRole;
+        class AccessibleSelection;
+    }
+    namespace swing
+    {
+        class JTree;
+        class JTree$AccessibleJTree;
+      namespace event
+      {
+          class TreeExpansionEvent;
+          class TreeModelEvent;
+          class TreeSelectionEvent;
+      }
+    }
+  }
+}
+
+class javax::swing::JTree$AccessibleJTree : public ::javax::swing::JComponent$AccessibleJComponent
+{
+
+public:
+  JTree$AccessibleJTree(::javax::swing::JTree *);
+  virtual void addAccessibleSelection(jint);
+  virtual void clearAccessibleSelection();
+  virtual void fireVisibleDataPropertyChange();
+  virtual ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Point *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
+  virtual jint getAccessibleChildrenCount();
+  virtual jint getAccessibleIndexInParent();
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+  virtual ::javax::accessibility::AccessibleSelection * getAccessibleSelection();
+  virtual ::javax::accessibility::Accessible * getAccessibleSelection(jint);
+  virtual jint getAccessibleSelectionCount();
+  virtual jboolean isAccessibleChildSelected(jint);
+  virtual void removeAccessibleSelection(jint);
+  virtual void selectAllAccessibleSelection();
+  virtual void treeCollapsed(::javax::swing::event::TreeExpansionEvent *);
+  virtual void treeExpanded(::javax::swing::event::TreeExpansionEvent *);
+  virtual void treeNodesChanged(::javax::swing::event::TreeModelEvent *);
+  virtual void treeNodesInserted(::javax::swing::event::TreeModelEvent *);
+  virtual void treeNodesRemoved(::javax::swing::event::TreeModelEvent *);
+  virtual void treeStructureChanged(::javax::swing::event::TreeModelEvent *);
+  virtual void valueChanged(::javax::swing::event::TreeSelectionEvent *);
+public: // actually package-private
+  static ::javax::swing::JTree * access$0(::javax::swing::JTree$AccessibleJTree *);
+  ::javax::swing::JTree * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JTree$AccessibleJTree__
diff --git a/libjava/javax/swing/JTree$DynamicUtilTreeNode.h b/libjava/javax/swing/JTree$DynamicUtilTreeNode.h
new file mode 100644
index 000000000..0d658dd37
--- /dev/null
+++ b/libjava/javax/swing/JTree$DynamicUtilTreeNode.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JTree$DynamicUtilTreeNode__
+#define __javax_swing_JTree$DynamicUtilTreeNode__
+
+#pragma interface
+
+#include <javax/swing/tree/DefaultMutableTreeNode.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JTree$DynamicUtilTreeNode;
+      namespace tree
+      {
+          class DefaultMutableTreeNode;
+          class TreeNode;
+      }
+    }
+  }
+}
+
+class javax::swing::JTree$DynamicUtilTreeNode : public ::javax::swing::tree::DefaultMutableTreeNode
+{
+
+public:
+  JTree$DynamicUtilTreeNode(::java::lang::Object *, ::java::lang::Object *);
+  virtual jint getChildCount();
+public: // actually protected
+  virtual void loadChildren();
+public:
+  virtual ::java::util::Enumeration * children();
+  virtual ::javax::swing::tree::TreeNode * getChildAt(jint);
+  virtual jboolean isLeaf();
+  static void createChildren(::javax::swing::tree::DefaultMutableTreeNode *, ::java::lang::Object *);
+public: // actually protected
+  ::java::lang::Object * __attribute__((aligned(__alignof__( ::javax::swing::tree::DefaultMutableTreeNode)))) childValue;
+  jboolean loadedChildren;
+  jboolean hasChildren;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JTree$DynamicUtilTreeNode__
diff --git a/libjava/javax/swing/JTree$EmptySelectionModel.h b/libjava/javax/swing/JTree$EmptySelectionModel.h
new file mode 100644
index 000000000..bafe35f2d
--- /dev/null
+++ b/libjava/javax/swing/JTree$EmptySelectionModel.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JTree$EmptySelectionModel__
+#define __javax_swing_JTree$EmptySelectionModel__
+
+#pragma interface
+
+#include <javax/swing/tree/DefaultTreeSelectionModel.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JTree$EmptySelectionModel;
+      namespace tree
+      {
+          class TreePath;
+      }
+    }
+  }
+}
+
+class javax::swing::JTree$EmptySelectionModel : public ::javax::swing::tree::DefaultTreeSelectionModel
+{
+
+public: // actually protected
+  JTree$EmptySelectionModel();
+public:
+  static ::javax::swing::JTree$EmptySelectionModel * sharedInstance();
+  virtual void setSelectionPaths(JArray< ::javax::swing::tree::TreePath * > *);
+  virtual void addSelectionPaths(JArray< ::javax::swing::tree::TreePath * > *);
+  virtual void removeSelectionPaths(JArray< ::javax::swing::tree::TreePath * > *);
+private:
+  static const jlong serialVersionUID = -5815023306225701477LL;
+public: // actually protected
+  static ::javax::swing::JTree$EmptySelectionModel * sharedInstance__;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JTree$EmptySelectionModel__
diff --git a/libjava/javax/swing/JTree$TreeModelHandler.h b/libjava/javax/swing/JTree$TreeModelHandler.h
new file mode 100644
index 000000000..3fc8f6549
--- /dev/null
+++ b/libjava/javax/swing/JTree$TreeModelHandler.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JTree$TreeModelHandler__
+#define __javax_swing_JTree$TreeModelHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JTree;
+        class JTree$TreeModelHandler;
+      namespace event
+      {
+          class TreeModelEvent;
+      }
+    }
+  }
+}
+
+class javax::swing::JTree$TreeModelHandler : public ::java::lang::Object
+{
+
+public: // actually protected
+  JTree$TreeModelHandler(::javax::swing::JTree *);
+public:
+  virtual void treeNodesChanged(::javax::swing::event::TreeModelEvent *);
+  virtual void treeNodesInserted(::javax::swing::event::TreeModelEvent *);
+  virtual void treeNodesRemoved(::javax::swing::event::TreeModelEvent *);
+  virtual void treeStructureChanged(::javax::swing::event::TreeModelEvent *);
+public: // actually package-private
+  ::javax::swing::JTree * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JTree$TreeModelHandler__
diff --git a/libjava/javax/swing/JTree$TreeSelectionRedirector.h b/libjava/javax/swing/JTree$TreeSelectionRedirector.h
new file mode 100644
index 000000000..a7a1a6e65
--- /dev/null
+++ b/libjava/javax/swing/JTree$TreeSelectionRedirector.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JTree$TreeSelectionRedirector__
+#define __javax_swing_JTree$TreeSelectionRedirector__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JTree;
+        class JTree$TreeSelectionRedirector;
+      namespace event
+      {
+          class TreeSelectionEvent;
+      }
+    }
+  }
+}
+
+class javax::swing::JTree$TreeSelectionRedirector : public ::java::lang::Object
+{
+
+public: // actually protected
+  JTree$TreeSelectionRedirector(::javax::swing::JTree *);
+public:
+  virtual void valueChanged(::javax::swing::event::TreeSelectionEvent *);
+private:
+  static const jlong serialVersionUID = -3505069663646241664LL;
+public: // actually package-private
+  ::javax::swing::JTree * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JTree$TreeSelectionRedirector__
diff --git a/libjava/javax/swing/JTree.h b/libjava/javax/swing/JTree.h
new file mode 100644
index 000000000..c9e66df2c
--- /dev/null
+++ b/libjava/javax/swing/JTree.h
@@ -0,0 +1,270 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JTree__
+#define __javax_swing_JTree__
+
+#pragma interface
+
+#include <javax/swing/JComponent.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class JTree;
+        class JTree$TreeSelectionRedirector;
+      namespace event
+      {
+          class TreeExpansionListener;
+          class TreeModelListener;
+          class TreeSelectionEvent;
+          class TreeSelectionListener;
+          class TreeWillExpandListener;
+      }
+      namespace plaf
+      {
+          class TreeUI;
+      }
+      namespace text
+      {
+          class Position$Bias;
+      }
+      namespace tree
+      {
+          class TreeCellEditor;
+          class TreeCellRenderer;
+          class TreeModel;
+          class TreeNode;
+          class TreePath;
+          class TreeSelectionModel;
+      }
+    }
+  }
+}
+
+class javax::swing::JTree : public ::javax::swing::JComponent
+{
+
+public:
+  JTree();
+  JTree(::java::util::Hashtable *);
+  JTree(JArray< ::java::lang::Object * > *);
+  JTree(::javax::swing::tree::TreeModel *);
+  JTree(::javax::swing::tree::TreeNode *);
+  JTree(::javax::swing::tree::TreeNode *, jboolean);
+  JTree(::java::util::Vector *);
+  virtual jint getRowForPath(::javax::swing::tree::TreePath *);
+  virtual ::javax::swing::tree::TreePath * getPathForRow(jint);
+public: // actually protected
+  virtual JArray< ::javax::swing::tree::TreePath * > * getPathBetweenRows(jint, jint);
+  static ::javax::swing::tree::TreeModel * createTreeModel(::java::lang::Object *);
+public:
+  virtual ::javax::swing::plaf::TreeUI * getUI();
+  virtual void setUI(::javax::swing::plaf::TreeUI *);
+  virtual void updateUI();
+  virtual ::java::lang::String * getUIClassID();
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+  virtual ::java::awt::Dimension * getPreferredScrollableViewportSize();
+  virtual jint getScrollableUnitIncrement(::java::awt::Rectangle *, jint, jint);
+  virtual jint getScrollableBlockIncrement(::java::awt::Rectangle *, jint, jint);
+  virtual jboolean getScrollableTracksViewportHeight();
+  virtual jboolean getScrollableTracksViewportWidth();
+  virtual void addTreeExpansionListener(::javax::swing::event::TreeExpansionListener *);
+  virtual void removeTreeExpansionListener(::javax::swing::event::TreeExpansionListener *);
+  virtual JArray< ::javax::swing::event::TreeExpansionListener * > * getTreeExpansionListeners();
+  virtual void fireTreeCollapsed(::javax::swing::tree::TreePath *);
+  virtual void fireTreeExpanded(::javax::swing::tree::TreePath *);
+  virtual void addTreeSelectionListener(::javax::swing::event::TreeSelectionListener *);
+  virtual void removeTreeSelectionListener(::javax::swing::event::TreeSelectionListener *);
+  virtual JArray< ::javax::swing::event::TreeSelectionListener * > * getTreeSelectionListeners();
+public: // actually protected
+  virtual void fireValueChanged(::javax::swing::event::TreeSelectionEvent *);
+public:
+  virtual void addTreeWillExpandListener(::javax::swing::event::TreeWillExpandListener *);
+  virtual void removeTreeWillExpandListener(::javax::swing::event::TreeWillExpandListener *);
+  virtual JArray< ::javax::swing::event::TreeWillExpandListener * > * getTreeWillExpandListeners();
+  virtual void fireTreeWillCollapse(::javax::swing::tree::TreePath *);
+  virtual void fireTreeWillExpand(::javax::swing::tree::TreePath *);
+  virtual ::javax::swing::tree::TreeModel * getModel();
+  virtual void setModel(::javax::swing::tree::TreeModel *);
+  virtual jboolean isEditable();
+  virtual void setEditable(jboolean);
+  virtual jboolean isRootVisible();
+  virtual void setRootVisible(jboolean);
+  virtual jboolean getShowsRootHandles();
+  virtual void setShowsRootHandles(jboolean);
+  virtual ::javax::swing::tree::TreeCellEditor * getCellEditor();
+  virtual void setCellEditor(::javax::swing::tree::TreeCellEditor *);
+  virtual ::javax::swing::tree::TreeCellRenderer * getCellRenderer();
+  virtual void setCellRenderer(::javax::swing::tree::TreeCellRenderer *);
+  virtual ::javax::swing::tree::TreeSelectionModel * getSelectionModel();
+  virtual void setSelectionModel(::javax::swing::tree::TreeSelectionModel *);
+  virtual jint getVisibleRowCount();
+  virtual void setVisibleRowCount(jint);
+  virtual jboolean isLargeModel();
+  virtual void setLargeModel(jboolean);
+  virtual jint getRowHeight();
+  virtual void setRowHeight(jint);
+  virtual jboolean isFixedRowHeight();
+  virtual jboolean getInvokesStopCellEditing();
+  virtual void setInvokesStopCellEditing(jboolean);
+  virtual jint getToggleClickCount();
+  virtual void setToggleClickCount(jint);
+  virtual void scrollPathToVisible(::javax::swing::tree::TreePath *);
+  virtual void scrollRowToVisible(jint);
+  virtual jboolean getScrollsOnExpand();
+  virtual void setScrollsOnExpand(jboolean);
+  virtual void setSelectionPath(::javax::swing::tree::TreePath *);
+  virtual void setSelectionPaths(JArray< ::javax::swing::tree::TreePath * > *);
+private:
+  void clearSelectionPathStates();
+public:
+  virtual void setSelectionRow(jint);
+  virtual void setSelectionRows(JArray< jint > *);
+  virtual void setSelectionInterval(jint, jint);
+  virtual void addSelectionPath(::javax::swing::tree::TreePath *);
+  virtual void addSelectionPaths(JArray< ::javax::swing::tree::TreePath * > *);
+  virtual void addSelectionRow(jint);
+  virtual void addSelectionRows(JArray< jint > *);
+  virtual void addSelectionInterval(jint, jint);
+  virtual void removeSelectionPath(::javax::swing::tree::TreePath *);
+  virtual void removeSelectionPaths(JArray< ::javax::swing::tree::TreePath * > *);
+  virtual void removeSelectionRow(jint);
+  virtual void removeSelectionRows(JArray< jint > *);
+  virtual void removeSelectionInterval(jint, jint);
+  virtual void clearSelection();
+  virtual ::javax::swing::tree::TreePath * getLeadSelectionPath();
+  virtual void setLeadSelectionPath(::javax::swing::tree::TreePath *);
+  virtual ::javax::swing::tree::TreePath * getAnchorSelectionPath();
+  virtual void setAnchorSelectionPath(::javax::swing::tree::TreePath *);
+  virtual jint getLeadSelectionRow();
+  virtual jint getMaxSelectionRow();
+  virtual jint getMinSelectionRow();
+  virtual jint getSelectionCount();
+  virtual ::javax::swing::tree::TreePath * getSelectionPath();
+  virtual JArray< ::javax::swing::tree::TreePath * > * getSelectionPaths();
+  virtual JArray< jint > * getSelectionRows();
+  virtual jboolean isPathSelected(::javax::swing::tree::TreePath *);
+  virtual jboolean isRowSelected(jint);
+  virtual jboolean isSelectionEmpty();
+  virtual jboolean getDragEnabled();
+  virtual void setDragEnabled(jboolean);
+  virtual jint getRowCount();
+  virtual void collapsePath(::javax::swing::tree::TreePath *);
+  virtual void collapseRow(jint);
+  virtual void expandPath(::javax::swing::tree::TreePath *);
+  virtual void expandRow(jint);
+  virtual jboolean isCollapsed(::javax::swing::tree::TreePath *);
+  virtual jboolean isCollapsed(jint);
+  virtual jboolean isExpanded(::javax::swing::tree::TreePath *);
+  virtual jboolean isExpanded(jint);
+  virtual jboolean getExpandsSelectedPaths();
+  virtual void setExpandsSelectedPaths(jboolean);
+  virtual ::java::awt::Rectangle * getPathBounds(::javax::swing::tree::TreePath *);
+  virtual ::java::awt::Rectangle * getRowBounds(jint);
+  virtual jboolean isEditing();
+  virtual jboolean stopEditing();
+  virtual void cancelEditing();
+  virtual void startEditingAtPath(::javax::swing::tree::TreePath *);
+  virtual ::javax::swing::tree::TreePath * getEditingPath();
+  virtual ::javax::swing::tree::TreePath * getPathForLocation(jint, jint);
+  virtual jint getRowForLocation(jint, jint);
+  virtual ::javax::swing::tree::TreePath * getClosestPathForLocation(jint, jint);
+  virtual jint getClosestRowForLocation(jint, jint);
+  virtual ::java::lang::Object * getLastSelectedPathComponent();
+private:
+  void doExpandParents(::javax::swing::tree::TreePath *, jboolean);
+public: // actually protected
+  virtual void setExpandedState(::javax::swing::tree::TreePath *, jboolean);
+  virtual void clearToggledPaths();
+  virtual ::java::util::Enumeration * getDescendantToggledPaths(::javax::swing::tree::TreePath *);
+public:
+  virtual jboolean hasBeenExpanded(::javax::swing::tree::TreePath *);
+  virtual jboolean isVisible(::javax::swing::tree::TreePath *);
+  virtual void makeVisible(::javax::swing::tree::TreePath *);
+  virtual jboolean isPathEditable(::javax::swing::tree::TreePath *);
+public: // actually protected
+  virtual ::javax::swing::event::TreeModelListener * createTreeModelListener();
+  static ::javax::swing::tree::TreeModel * getDefaultTreeModel();
+public:
+  virtual ::java::lang::String * convertValueToText(::java::lang::Object *, jboolean, jboolean, jboolean, jint, jboolean);
+public: // actually protected
+  virtual ::java::lang::String * paramString();
+public:
+  virtual ::java::util::Enumeration * getExpandedDescendants(::javax::swing::tree::TreePath *);
+  virtual ::javax::swing::tree::TreePath * getNextMatch(::java::lang::String *, jint, ::javax::swing::text::Position$Bias *);
+public: // actually protected
+  virtual jboolean removeDescendantSelectedPaths(::javax::swing::tree::TreePath *, jboolean);
+  virtual void removeDescendantToggledPaths(::java::util::Enumeration *);
+public:
+  virtual void treeDidChange();
+public: // actually package-private
+  virtual void setUIProperty(::java::lang::String *, ::java::lang::Object *);
+private:
+  static const jlong serialVersionUID = 7559816092864483649LL;
+public:
+  static ::java::lang::String * CELL_EDITOR_PROPERTY;
+  static ::java::lang::String * CELL_RENDERER_PROPERTY;
+  static ::java::lang::String * EDITABLE_PROPERTY;
+  static ::java::lang::String * INVOKES_STOP_CELL_EDITING_PROPERTY;
+  static ::java::lang::String * LARGE_MODEL_PROPERTY;
+  static ::java::lang::String * ROOT_VISIBLE_PROPERTY;
+  static ::java::lang::String * ROW_HEIGHT_PROPERTY;
+  static ::java::lang::String * SCROLLS_ON_EXPAND_PROPERTY;
+  static ::java::lang::String * SELECTION_MODEL_PROPERTY;
+  static ::java::lang::String * SHOWS_ROOT_HANDLES_PROPERTY;
+  static ::java::lang::String * TOGGLE_CLICK_COUNT_PROPERTY;
+  static ::java::lang::String * TREE_MODEL_PROPERTY;
+  static ::java::lang::String * VISIBLE_ROW_COUNT_PROPERTY;
+  static ::java::lang::String * ANCHOR_SELECTION_PATH_PROPERTY;
+  static ::java::lang::String * LEAD_SELECTION_PATH_PROPERTY;
+  static ::java::lang::String * EXPANDS_SELECTED_PATHS_PROPERTY;
+private:
+  static ::java::lang::Object * EXPANDED;
+  static ::java::lang::Object * COLLAPSED;
+  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) dragEnabled;
+  jboolean expandsSelectedPaths;
+  ::javax::swing::tree::TreePath * anchorSelectionPath;
+public: // actually package-private
+  ::java::util::Hashtable * nodeStates;
+public: // actually protected
+  ::javax::swing::tree::TreeCellEditor * cellEditor;
+  ::javax::swing::tree::TreeCellRenderer * cellRenderer;
+  jboolean editable;
+  jboolean invokesStopCellEditing;
+  jboolean largeModel;
+  jboolean rootVisible;
+  jint rowHeight;
+  jboolean scrollsOnExpand;
+  ::javax::swing::tree::TreeSelectionModel * selectionModel;
+  jboolean showsRootHandles;
+  jint toggleClickCount;
+  ::javax::swing::tree::TreeModel * treeModel;
+  jint visibleRowCount;
+  ::javax::swing::event::TreeModelListener * treeModelListener;
+  ::javax::swing::JTree$TreeSelectionRedirector * selectionRedirector;
+private:
+  jboolean clientRowHeightSet;
+  jboolean clientScrollsOnExpandSet;
+  jboolean clientShowsRootHandlesSet;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JTree__
diff --git a/libjava/javax/swing/JViewport$AccessibleJViewport.h b/libjava/javax/swing/JViewport$AccessibleJViewport.h
new file mode 100644
index 000000000..bccdb7f29
--- /dev/null
+++ b/libjava/javax/swing/JViewport$AccessibleJViewport.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JViewport$AccessibleJViewport__
+#define __javax_swing_JViewport$AccessibleJViewport__
+
+#pragma interface
+
+#include <javax/swing/JComponent$AccessibleJComponent.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleRole;
+    }
+    namespace swing
+    {
+        class JViewport;
+        class JViewport$AccessibleJViewport;
+    }
+  }
+}
+
+class javax::swing::JViewport$AccessibleJViewport : public ::javax::swing::JComponent$AccessibleJComponent
+{
+
+public: // actually protected
+  JViewport$AccessibleJViewport(::javax::swing::JViewport *);
+public:
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+public: // actually package-private
+  ::javax::swing::JViewport * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JViewport$AccessibleJViewport__
diff --git a/libjava/javax/swing/JViewport$ViewListener.h b/libjava/javax/swing/JViewport$ViewListener.h
new file mode 100644
index 000000000..a7de943b6
--- /dev/null
+++ b/libjava/javax/swing/JViewport$ViewListener.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JViewport$ViewListener__
+#define __javax_swing_JViewport$ViewListener__
+
+#pragma interface
+
+#include <java/awt/event/ComponentAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ComponentEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JViewport;
+        class JViewport$ViewListener;
+    }
+  }
+}
+
+class javax::swing::JViewport$ViewListener : public ::java::awt::event::ComponentAdapter
+{
+
+public: // actually protected
+  JViewport$ViewListener(::javax::swing::JViewport *);
+public:
+  virtual void componentResized(::java::awt::event::ComponentEvent *);
+private:
+  static const jlong serialVersionUID = -2812489404285958070LL;
+public: // actually package-private
+  ::javax::swing::JViewport * __attribute__((aligned(__alignof__( ::java::awt::event::ComponentAdapter)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JViewport$ViewListener__
diff --git a/libjava/javax/swing/JViewport.h b/libjava/javax/swing/JViewport.h
new file mode 100644
index 000000000..0ac6b8fbd
--- /dev/null
+++ b/libjava/javax/swing/JViewport.h
@@ -0,0 +1,132 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JViewport__
+#define __javax_swing_JViewport__
+
+#pragma interface
+
+#include <javax/swing/JComponent.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Dimension;
+        class Graphics;
+        class Image;
+        class Insets;
+        class LayoutManager;
+        class Point;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class JViewport;
+        class JViewport$ViewListener;
+      namespace border
+      {
+          class Border;
+      }
+      namespace event
+      {
+          class ChangeEvent;
+          class ChangeListener;
+      }
+      namespace plaf
+      {
+          class ViewportUI;
+      }
+    }
+  }
+}
+
+class javax::swing::JViewport : public ::javax::swing::JComponent
+{
+
+public:
+  JViewport();
+  virtual ::java::awt::Dimension * getExtentSize();
+  virtual ::java::awt::Dimension * toViewCoordinates(::java::awt::Dimension *);
+  virtual ::java::awt::Point * toViewCoordinates(::java::awt::Point *);
+  virtual void setExtentSize(::java::awt::Dimension *);
+  virtual ::java::awt::Dimension * getViewSize();
+  virtual void setViewSize(::java::awt::Dimension *);
+  virtual ::java::awt::Point * getViewPosition();
+  virtual void setViewPosition(::java::awt::Point *);
+  virtual ::java::awt::Rectangle * getViewRect();
+  virtual jboolean isBackingStoreEnabled();
+  virtual void setBackingStoreEnabled(jboolean);
+  virtual void setScrollMode(jint);
+  virtual jint getScrollMode();
+  virtual ::java::awt::Component * getView();
+  virtual void setView(::java::awt::Component *);
+  virtual void reshape(jint, jint, jint, jint);
+  virtual ::java::awt::Insets * getInsets();
+  virtual ::java::awt::Insets * getInsets(::java::awt::Insets *);
+  virtual jboolean isOptimizedDrawingEnabled();
+  virtual void paint(::java::awt::Graphics *);
+  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
+  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
+  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
+  virtual ::java::lang::String * getUIClassID();
+  virtual void updateUI();
+  virtual ::javax::swing::plaf::ViewportUI * getUI();
+  virtual void setUI(::javax::swing::plaf::ViewportUI *);
+  virtual void setBorder(::javax::swing::border::Border *);
+  virtual void scrollRectToVisible(::java::awt::Rectangle *);
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+  virtual void repaint(jlong, jint, jint, jint, jint);
+public: // actually protected
+  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
+  virtual void fireStateChanged();
+  virtual ::javax::swing::JViewport$ViewListener * createViewListener();
+  virtual ::java::awt::LayoutManager * createLayoutManager();
+  virtual jboolean computeBlit(jint, jint, ::java::awt::Point *, ::java::awt::Point *, ::java::awt::Dimension *, ::java::awt::Rectangle *);
+public: // actually package-private
+  virtual void paintSimple(::java::awt::Graphics *);
+  virtual void paintBackingStore(::java::awt::Graphics *);
+  virtual void paintBlit(::java::awt::Graphics *);
+  virtual void paintImmediately2(jint, jint, jint, jint);
+  virtual jboolean isPaintRoot();
+public:
+  static const jint SIMPLE_SCROLL_MODE = 0;
+  static const jint BLIT_SCROLL_MODE = 1;
+  static const jint BACKINGSTORE_SCROLL_MODE = 2;
+private:
+  static const jlong serialVersionUID = -6925142919680527970LL;
+  static jint defaultScrollMode;
+public: // actually protected
+  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) scrollUnderway;
+  jboolean isViewSizeSet;
+  jboolean backingStore;
+  ::java::awt::Image * backingStoreImage;
+  ::java::awt::Point * lastPaintPosition;
+public: // actually package-private
+  ::javax::swing::event::ChangeEvent * changeEvent;
+  jint scrollMode;
+  ::javax::swing::JViewport$ViewListener * viewListener;
+  ::java::awt::Point * cachedBlitFrom;
+  ::java::awt::Point * cachedBlitTo;
+  ::java::awt::Dimension * cachedBlitSize;
+  ::java::awt::Rectangle * cachedBlitPaint;
+  jboolean damaged;
+  jboolean sizeChanged;
+private:
+  jboolean isPaintRoot__;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JViewport__
diff --git a/libjava/javax/swing/JWindow$AccessibleJWindow.h b/libjava/javax/swing/JWindow$AccessibleJWindow.h
new file mode 100644
index 000000000..f7aa58a2b
--- /dev/null
+++ b/libjava/javax/swing/JWindow$AccessibleJWindow.h
@@ -0,0 +1,33 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JWindow$AccessibleJWindow__
+#define __javax_swing_JWindow$AccessibleJWindow__
+
+#pragma interface
+
+#include <java/awt/Window$AccessibleAWTWindow.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JWindow;
+        class JWindow$AccessibleJWindow;
+    }
+  }
+}
+
+class javax::swing::JWindow$AccessibleJWindow : public ::java::awt::Window$AccessibleAWTWindow
+{
+
+public: // actually protected
+  JWindow$AccessibleJWindow(::javax::swing::JWindow *);
+public: // actually package-private
+  ::javax::swing::JWindow * __attribute__((aligned(__alignof__( ::java::awt::Window$AccessibleAWTWindow)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JWindow$AccessibleJWindow__
diff --git a/libjava/javax/swing/JWindow.h b/libjava/javax/swing/JWindow.h
new file mode 100644
index 000000000..89a7ebab7
--- /dev/null
+++ b/libjava/javax/swing/JWindow.h
@@ -0,0 +1,95 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_JWindow__
+#define __javax_swing_JWindow__
+
+#pragma interface
+
+#include <java/awt/Window.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+        class Frame;
+        class Graphics;
+        class GraphicsConfiguration;
+        class LayoutManager;
+        class Window;
+      namespace event
+      {
+          class KeyEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class JLayeredPane;
+        class JRootPane;
+        class JWindow;
+    }
+  }
+}
+
+class javax::swing::JWindow : public ::java::awt::Window
+{
+
+public:
+  JWindow();
+  JWindow(::java::awt::GraphicsConfiguration *);
+  JWindow(::java::awt::Frame *);
+  JWindow(::java::awt::Window *);
+  JWindow(::java::awt::Window *, ::java::awt::GraphicsConfiguration *);
+public: // actually protected
+  virtual void windowInit();
+public:
+  virtual ::java::awt::Dimension * getPreferredSize();
+  virtual void setLayout(::java::awt::LayoutManager *);
+  virtual void setLayeredPane(::javax::swing::JLayeredPane *);
+  virtual ::javax::swing::JLayeredPane * getLayeredPane();
+  virtual ::javax::swing::JRootPane * getRootPane();
+public: // actually protected
+  virtual void setRootPane(::javax::swing::JRootPane *);
+  virtual ::javax::swing::JRootPane * createRootPane();
+public:
+  virtual ::java::awt::Container * getContentPane();
+  virtual void setContentPane(::java::awt::Container *);
+  virtual ::java::awt::Component * getGlassPane();
+  virtual void setGlassPane(::java::awt::Component *);
+public: // actually protected
+  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
+public:
+  virtual void remove(::java::awt::Component *);
+public: // actually protected
+  virtual jboolean isRootPaneCheckingEnabled();
+  virtual void setRootPaneCheckingEnabled(jboolean);
+public:
+  virtual void update(::java::awt::Graphics *);
+public: // actually protected
+  virtual void processKeyEvent(::java::awt::event::KeyEvent *);
+public:
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+public: // actually protected
+  virtual ::java::lang::String * paramString();
+private:
+  static const jlong serialVersionUID = 5420698392125238833LL;
+public: // actually protected
+  ::javax::swing::JRootPane * __attribute__((aligned(__alignof__( ::java::awt::Window)))) rootPane;
+  jboolean rootPaneCheckingEnabled;
+  ::javax::accessibility::AccessibleContext * accessibleContext;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_JWindow__
diff --git a/libjava/javax/swing/KeyStroke.h b/libjava/javax/swing/KeyStroke.h
new file mode 100644
index 000000000..640225608
--- /dev/null
+++ b/libjava/javax/swing/KeyStroke.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_KeyStroke__
+#define __javax_swing_KeyStroke__
+
+#pragma interface
+
+#include <java/awt/AWTKeyStroke.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class KeyEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class KeyStroke;
+    }
+  }
+}
+
+class javax::swing::KeyStroke : public ::java::awt::AWTKeyStroke
+{
+
+  KeyStroke();
+  KeyStroke(jchar, jint, jint, jboolean);
+public:
+  static ::javax::swing::KeyStroke * getKeyStroke(jchar);
+  static ::javax::swing::KeyStroke * getKeyStroke(jchar, jboolean);
+  static ::javax::swing::KeyStroke * getKeyStroke(::java::lang::Character *, jint);
+  static ::javax::swing::KeyStroke * getKeyStroke(jint, jint, jboolean);
+  static ::javax::swing::KeyStroke * getKeyStroke(jint, jint);
+  static ::javax::swing::KeyStroke * getKeyStroke(::java::lang::String *);
+  static ::javax::swing::KeyStroke * getKeyStrokeForEvent(::java::awt::event::KeyEvent *);
+private:
+  static const jlong serialVersionUID = -9060180771037902530LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_KeyStroke__
diff --git a/libjava/javax/swing/KeyboardManager.h b/libjava/javax/swing/KeyboardManager.h
new file mode 100644
index 000000000..28679e6c2
--- /dev/null
+++ b/libjava/javax/swing/KeyboardManager.h
@@ -0,0 +1,65 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_KeyboardManager__
+#define __javax_swing_KeyboardManager__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+      namespace event
+      {
+          class KeyEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ComponentInputMap;
+        class JComponent;
+        class JMenuBar;
+        class KeyStroke;
+        class KeyboardManager;
+    }
+  }
+}
+
+class javax::swing::KeyboardManager : public ::java::lang::Object
+{
+
+public: // actually package-private
+  KeyboardManager();
+public:
+  static ::javax::swing::KeyboardManager * getManager();
+public: // actually package-private
+  static ::java::awt::Container * findTopLevel(::java::awt::Component *);
+  virtual ::java::util::Hashtable * getHashtableForTopLevel(::java::awt::Container *);
+public:
+  virtual void registerBinding(::javax::swing::JComponent *, ::javax::swing::KeyStroke *);
+  virtual void clearBindingsForComp(::javax::swing::JComponent *);
+  virtual void registerEntireMap(::javax::swing::ComponentInputMap *);
+  virtual jboolean processKeyStroke(::java::awt::Component *, ::javax::swing::KeyStroke *, ::java::awt::event::KeyEvent *);
+public: // actually package-private
+  virtual ::java::util::Vector * getVectorForTopLevel(::java::awt::Container *);
+public:
+  virtual void registerJMenuBar(::javax::swing::JMenuBar *);
+  virtual void unregisterJMenuBar(::javax::swing::JMenuBar *);
+public: // actually package-private
+  static ::javax::swing::KeyboardManager * manager;
+  ::java::util::WeakHashMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) topLevelLookup;
+  ::java::util::Hashtable * menuBarLookup;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_KeyboardManager__
diff --git a/libjava/javax/swing/LayoutFocusTraversalPolicy$LayoutComparator.h b/libjava/javax/swing/LayoutFocusTraversalPolicy$LayoutComparator.h
new file mode 100644
index 000000000..5687b1fb2
--- /dev/null
+++ b/libjava/javax/swing/LayoutFocusTraversalPolicy$LayoutComparator.h
@@ -0,0 +1,30 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_LayoutFocusTraversalPolicy$LayoutComparator__
+#define __javax_swing_LayoutFocusTraversalPolicy$LayoutComparator__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class LayoutFocusTraversalPolicy$LayoutComparator;
+    }
+  }
+}
+
+class javax::swing::LayoutFocusTraversalPolicy$LayoutComparator : public ::java::lang::Object
+{
+
+public:
+  LayoutFocusTraversalPolicy$LayoutComparator();
+  virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_LayoutFocusTraversalPolicy$LayoutComparator__
diff --git a/libjava/javax/swing/LayoutFocusTraversalPolicy.h b/libjava/javax/swing/LayoutFocusTraversalPolicy.h
new file mode 100644
index 000000000..29883c221
--- /dev/null
+++ b/libjava/javax/swing/LayoutFocusTraversalPolicy.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_LayoutFocusTraversalPolicy__
+#define __javax_swing_LayoutFocusTraversalPolicy__
+
+#pragma interface
+
+#include <javax/swing/SortingFocusTraversalPolicy.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class LayoutFocusTraversalPolicy;
+    }
+  }
+}
+
+class javax::swing::LayoutFocusTraversalPolicy : public ::javax::swing::SortingFocusTraversalPolicy
+{
+
+public:
+  LayoutFocusTraversalPolicy();
+private:
+  static const jlong serialVersionUID = 4312146927238881442LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_LayoutFocusTraversalPolicy__
diff --git a/libjava/javax/swing/ListCellRenderer.h b/libjava/javax/swing/ListCellRenderer.h
new file mode 100644
index 000000000..324a21848
--- /dev/null
+++ b/libjava/javax/swing/ListCellRenderer.h
@@ -0,0 +1,37 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_ListCellRenderer__
+#define __javax_swing_ListCellRenderer__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JList;
+        class ListCellRenderer;
+    }
+  }
+}
+
+class javax::swing::ListCellRenderer : public ::java::lang::Object
+{
+
+public:
+  virtual ::java::awt::Component * getListCellRendererComponent(::javax::swing::JList *, ::java::lang::Object *, jint, jboolean, jboolean) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_ListCellRenderer__
diff --git a/libjava/javax/swing/ListModel.h b/libjava/javax/swing/ListModel.h
new file mode 100644
index 000000000..73f268f7e
--- /dev/null
+++ b/libjava/javax/swing/ListModel.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_ListModel__
+#define __javax_swing_ListModel__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class ListModel;
+      namespace event
+      {
+          class ListDataListener;
+      }
+    }
+  }
+}
+
+class javax::swing::ListModel : public ::java::lang::Object
+{
+
+public:
+  virtual jint getSize() = 0;
+  virtual ::java::lang::Object * getElementAt(jint) = 0;
+  virtual void addListDataListener(::javax::swing::event::ListDataListener *) = 0;
+  virtual void removeListDataListener(::javax::swing::event::ListDataListener *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_ListModel__
diff --git a/libjava/javax/swing/ListSelectionModel.h b/libjava/javax/swing/ListSelectionModel.h
new file mode 100644
index 000000000..d7c7363cf
--- /dev/null
+++ b/libjava/javax/swing/ListSelectionModel.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_ListSelectionModel__
+#define __javax_swing_ListSelectionModel__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class ListSelectionModel;
+      namespace event
+      {
+          class ListSelectionListener;
+      }
+    }
+  }
+}
+
+class javax::swing::ListSelectionModel : public ::java::lang::Object
+{
+
+public:
+  virtual void setSelectionMode(jint) = 0;
+  virtual jint getSelectionMode() = 0;
+  virtual void clearSelection() = 0;
+  virtual jint getMinSelectionIndex() = 0;
+  virtual jint getMaxSelectionIndex() = 0;
+  virtual jboolean isSelectedIndex(jint) = 0;
+  virtual jboolean isSelectionEmpty() = 0;
+  virtual void setSelectionInterval(jint, jint) = 0;
+  virtual void addSelectionInterval(jint, jint) = 0;
+  virtual void removeSelectionInterval(jint, jint) = 0;
+  virtual void insertIndexInterval(jint, jint, jboolean) = 0;
+  virtual void removeIndexInterval(jint, jint) = 0;
+  virtual jint getAnchorSelectionIndex() = 0;
+  virtual void setAnchorSelectionIndex(jint) = 0;
+  virtual jint getLeadSelectionIndex() = 0;
+  virtual void setLeadSelectionIndex(jint) = 0;
+  virtual void setValueIsAdjusting(jboolean) = 0;
+  virtual jboolean getValueIsAdjusting() = 0;
+  virtual void addListSelectionListener(::javax::swing::event::ListSelectionListener *) = 0;
+  virtual void removeListSelectionListener(::javax::swing::event::ListSelectionListener *) = 0;
+  static const jint SINGLE_SELECTION = 0;
+  static const jint SINGLE_INTERVAL_SELECTION = 1;
+  static const jint MULTIPLE_INTERVAL_SELECTION = 2;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_ListSelectionModel__
diff --git a/libjava/javax/swing/LookAndFeel$1.h b/libjava/javax/swing/LookAndFeel$1.h
new file mode 100644
index 000000000..8764efbe4
--- /dev/null
+++ b/libjava/javax/swing/LookAndFeel$1.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_LookAndFeel$1__
+#define __javax_swing_LookAndFeel$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace net
+    {
+        class URL;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class LookAndFeel$1;
+        class UIDefaults;
+    }
+  }
+}
+
+class javax::swing::LookAndFeel$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  LookAndFeel$1(::java::net::URL *);
+public:
+  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
+private:
+  ::java::net::URL * __attribute__((aligned(__alignof__( ::java::lang::Object)))) val$file;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_LookAndFeel$1__
diff --git a/libjava/javax/swing/LookAndFeel.h b/libjava/javax/swing/LookAndFeel.h
new file mode 100644
index 000000000..1a1fd2177
--- /dev/null
+++ b/libjava/javax/swing/LookAndFeel.h
@@ -0,0 +1,68 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_LookAndFeel__
+#define __javax_swing_LookAndFeel__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ComponentInputMap;
+        class InputMap;
+        class JComponent;
+        class LookAndFeel;
+        class UIDefaults;
+      namespace text
+      {
+          class JTextComponent$KeyBinding;
+      }
+    }
+  }
+}
+
+class javax::swing::LookAndFeel : public ::java::lang::Object
+{
+
+public:
+  LookAndFeel();
+  virtual ::javax::swing::UIDefaults * getDefaults();
+  virtual ::java::lang::String * getDescription() = 0;
+  static ::java::lang::Object * getDesktopPropertyValue(::java::lang::String *, ::java::lang::Object *);
+  virtual ::java::lang::String * getID() = 0;
+  virtual ::java::lang::String * getName() = 0;
+  virtual jboolean getSupportsWindowDecorations();
+  virtual void initialize();
+  static void installBorder(::javax::swing::JComponent *, ::java::lang::String *);
+  static void installColors(::javax::swing::JComponent *, ::java::lang::String *, ::java::lang::String *);
+  static void installColorsAndFont(::javax::swing::JComponent *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
+  virtual jboolean isNativeLookAndFeel() = 0;
+  virtual jboolean isSupportedLookAndFeel() = 0;
+  static void loadKeyBindings(::javax::swing::InputMap *, JArray< ::java::lang::Object * > *);
+  static ::javax::swing::ComponentInputMap * makeComponentInputMap(::javax::swing::JComponent *, JArray< ::java::lang::Object * > *);
+  static ::java::lang::Object * makeIcon(::java::lang::Class *, ::java::lang::String *);
+  static ::javax::swing::InputMap * makeInputMap(JArray< ::java::lang::Object * > *);
+  static JArray< ::javax::swing::text::JTextComponent$KeyBinding * > * makeKeyBindings(JArray< ::java::lang::Object * > *);
+  virtual void provideErrorFeedback(::java::awt::Component *);
+  virtual ::java::lang::String * toString();
+  virtual void uninitialize();
+  static void uninstallBorder(::javax::swing::JComponent *);
+  static void installProperty(::javax::swing::JComponent *, ::java::lang::String *, ::java::lang::Object *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_LookAndFeel__
diff --git a/libjava/javax/swing/MenuElement.h b/libjava/javax/swing/MenuElement.h
new file mode 100644
index 000000000..d48ef9678
--- /dev/null
+++ b/libjava/javax/swing/MenuElement.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_MenuElement__
+#define __javax_swing_MenuElement__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+      namespace event
+      {
+          class KeyEvent;
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class MenuElement;
+        class MenuSelectionManager;
+    }
+  }
+}
+
+class javax::swing::MenuElement : public ::java::lang::Object
+{
+
+public:
+  virtual void processMouseEvent(::java::awt::event::MouseEvent *, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *) = 0;
+  virtual void processKeyEvent(::java::awt::event::KeyEvent *, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *) = 0;
+  virtual void menuSelectionChanged(jboolean) = 0;
+  virtual JArray< ::javax::swing::MenuElement * > * getSubElements() = 0;
+  virtual ::java::awt::Component * getComponent() = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_MenuElement__
diff --git a/libjava/javax/swing/MenuSelectionManager.h b/libjava/javax/swing/MenuSelectionManager.h
new file mode 100644
index 000000000..8e3cfa9e9
--- /dev/null
+++ b/libjava/javax/swing/MenuSelectionManager.h
@@ -0,0 +1,74 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_MenuSelectionManager__
+#define __javax_swing_MenuSelectionManager__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Point;
+      namespace event
+      {
+          class KeyEvent;
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class MenuElement;
+        class MenuSelectionManager;
+      namespace event
+      {
+          class ChangeEvent;
+          class ChangeListener;
+          class EventListenerList;
+      }
+    }
+  }
+}
+
+class javax::swing::MenuSelectionManager : public ::java::lang::Object
+{
+
+public:
+  MenuSelectionManager();
+public: // actually protected
+  virtual void fireStateChanged();
+public:
+  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
+  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
+  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
+  virtual void clearSelectedPath();
+  virtual ::java::awt::Component * componentForPoint(::java::awt::Component *, ::java::awt::Point *);
+  static ::javax::swing::MenuSelectionManager * defaultManager();
+  virtual JArray< ::javax::swing::MenuElement * > * getSelectedPath();
+  virtual jboolean isComponentPartOfCurrentMenu(::java::awt::Component *);
+  virtual void processKeyEvent(::java::awt::event::KeyEvent *);
+  virtual void processMouseEvent(::java::awt::event::MouseEvent *);
+  virtual void setSelectedPath(JArray< ::javax::swing::MenuElement * > *);
+private:
+  JArray< ::javax::swing::MenuElement * > * getPath(::java::awt::Component *);
+public: // actually protected
+  ::javax::swing::event::ChangeEvent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) changeEvent;
+  ::javax::swing::event::EventListenerList * listenerList;
+private:
+  static ::javax::swing::MenuSelectionManager * manager;
+  ::java::util::Vector * selectedPath;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_MenuSelectionManager__
diff --git a/libjava/javax/swing/MutableComboBoxModel.h b/libjava/javax/swing/MutableComboBoxModel.h
new file mode 100644
index 000000000..cfc677152
--- /dev/null
+++ b/libjava/javax/swing/MutableComboBoxModel.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_MutableComboBoxModel__
+#define __javax_swing_MutableComboBoxModel__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class MutableComboBoxModel;
+      namespace event
+      {
+          class ListDataListener;
+      }
+    }
+  }
+}
+
+class javax::swing::MutableComboBoxModel : public ::java::lang::Object
+{
+
+public:
+  virtual void addElement(::java::lang::Object *) = 0;
+  virtual void removeElementAt(jint) = 0;
+  virtual void insertElementAt(::java::lang::Object *, jint) = 0;
+  virtual void removeElement(::java::lang::Object *) = 0;
+  virtual void setSelectedItem(::java::lang::Object *) = 0;
+  virtual ::java::lang::Object * getSelectedItem() = 0;
+  virtual jint getSize() = 0;
+  virtual ::java::lang::Object * getElementAt(jint) = 0;
+  virtual void addListDataListener(::javax::swing::event::ListDataListener *) = 0;
+  virtual void removeListDataListener(::javax::swing::event::ListDataListener *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_MutableComboBoxModel__
diff --git a/libjava/javax/swing/OverlayLayout.h b/libjava/javax/swing/OverlayLayout.h
new file mode 100644
index 000000000..065b35f3b
--- /dev/null
+++ b/libjava/javax/swing/OverlayLayout.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_OverlayLayout__
+#define __javax_swing_OverlayLayout__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class OverlayLayout;
+        class SizeRequirements;
+    }
+  }
+}
+
+class javax::swing::OverlayLayout : public ::java::lang::Object
+{
+
+public:
+  OverlayLayout(::java::awt::Container *);
+  virtual void invalidateLayout(::java::awt::Container *);
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+  virtual void addLayoutComponent(::java::awt::Component *, ::java::lang::Object *);
+  virtual void removeLayoutComponent(::java::awt::Component *);
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * maximumLayoutSize(::java::awt::Container *);
+  virtual jfloat getLayoutAlignmentX(::java::awt::Container *);
+  virtual jfloat getLayoutAlignmentY(::java::awt::Container *);
+  virtual void layoutContainer(::java::awt::Container *);
+private:
+  void checkRequirements();
+  void checkTotalRequirements();
+  void checkLayout();
+  static const jlong serialVersionUID = 18082829169631543LL;
+  ::java::awt::Container * __attribute__((aligned(__alignof__( ::java::lang::Object)))) target;
+  JArray< ::javax::swing::SizeRequirements * > * xChildren;
+  JArray< ::javax::swing::SizeRequirements * > * yChildren;
+  ::javax::swing::SizeRequirements * xTotal;
+  ::javax::swing::SizeRequirements * yTotal;
+  JArray< jint > * offsetsX;
+  JArray< jint > * offsetsY;
+  JArray< jint > * spansX;
+  JArray< jint > * spansY;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_OverlayLayout__
diff --git a/libjava/javax/swing/Popup$JWindowPopup.h b/libjava/javax/swing/Popup$JWindowPopup.h
new file mode 100644
index 000000000..fd6d60d67
--- /dev/null
+++ b/libjava/javax/swing/Popup$JWindowPopup.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_Popup$JWindowPopup__
+#define __javax_swing_Popup$JWindowPopup__
+
+#pragma interface
+
+#include <javax/swing/Popup.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JWindow;
+        class Popup$JWindowPopup;
+    }
+  }
+}
+
+class javax::swing::Popup$JWindowPopup : public ::javax::swing::Popup
+{
+
+public:
+  Popup$JWindowPopup(::java::awt::Component *, ::java::awt::Component *, jint, jint);
+  virtual void show();
+  virtual void hide();
+public: // actually package-private
+  ::javax::swing::JWindow * __attribute__((aligned(__alignof__( ::javax::swing::Popup)))) window;
+private:
+  ::java::awt::Component * contents;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_Popup$JWindowPopup__
diff --git a/libjava/javax/swing/Popup$LightweightPopup.h b/libjava/javax/swing/Popup$LightweightPopup.h
new file mode 100644
index 000000000..d9b0123af
--- /dev/null
+++ b/libjava/javax/swing/Popup$LightweightPopup.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_Popup$LightweightPopup__
+#define __javax_swing_Popup$LightweightPopup__
+
+#pragma interface
+
+#include <javax/swing/Popup.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JLayeredPane;
+        class JPanel;
+        class Popup$LightweightPopup;
+    }
+  }
+}
+
+class javax::swing::Popup$LightweightPopup : public ::javax::swing::Popup
+{
+
+public:
+  Popup$LightweightPopup(::java::awt::Component *, ::java::awt::Component *, jint, jint);
+  virtual void show();
+  virtual void hide();
+public: // actually package-private
+  ::java::awt::Component * __attribute__((aligned(__alignof__( ::javax::swing::Popup)))) owner;
+  ::java::awt::Component * contents;
+  jint x;
+  jint y;
+private:
+  ::javax::swing::JPanel * panel;
+  ::javax::swing::JLayeredPane * layeredPane;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_Popup$LightweightPopup__
diff --git a/libjava/javax/swing/Popup.h b/libjava/javax/swing/Popup.h
new file mode 100644
index 000000000..8c7f4b1fe
--- /dev/null
+++ b/libjava/javax/swing/Popup.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_Popup__
+#define __javax_swing_Popup__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Popup;
+    }
+  }
+}
+
+class javax::swing::Popup : public ::java::lang::Object
+{
+
+public: // actually protected
+  Popup(::java::awt::Component *, ::java::awt::Component *, jint, jint);
+  Popup();
+public:
+  virtual void show();
+  virtual void hide();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_Popup__
diff --git a/libjava/javax/swing/PopupFactory.h b/libjava/javax/swing/PopupFactory.h
new file mode 100644
index 000000000..69f15a72a
--- /dev/null
+++ b/libjava/javax/swing/PopupFactory.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_PopupFactory__
+#define __javax_swing_PopupFactory__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Popup;
+        class PopupFactory;
+    }
+  }
+}
+
+class javax::swing::PopupFactory : public ::java::lang::Object
+{
+
+public:
+  PopupFactory();
+  static void setSharedInstance(::javax::swing::PopupFactory *);
+  static ::javax::swing::PopupFactory * getSharedInstance();
+  virtual ::javax::swing::Popup * getPopup(::java::awt::Component *, ::java::awt::Component *, jint, jint);
+private:
+  static ::javax::swing::PopupFactory * sharedFactory;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_PopupFactory__
diff --git a/libjava/javax/swing/ProgressMonitor$1.h b/libjava/javax/swing/ProgressMonitor$1.h
new file mode 100644
index 000000000..75b11921f
--- /dev/null
+++ b/libjava/javax/swing/ProgressMonitor$1.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_ProgressMonitor$1__
+#define __javax_swing_ProgressMonitor$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ProgressMonitor;
+        class ProgressMonitor$1;
+    }
+  }
+}
+
+class javax::swing::ProgressMonitor$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  ProgressMonitor$1(::javax::swing::ProgressMonitor *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::ProgressMonitor * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_ProgressMonitor$1__
diff --git a/libjava/javax/swing/ProgressMonitor$TimerListener.h b/libjava/javax/swing/ProgressMonitor$TimerListener.h
new file mode 100644
index 000000000..747fa707d
--- /dev/null
+++ b/libjava/javax/swing/ProgressMonitor$TimerListener.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_ProgressMonitor$TimerListener__
+#define __javax_swing_ProgressMonitor$TimerListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ProgressMonitor;
+        class ProgressMonitor$TimerListener;
+    }
+  }
+}
+
+class javax::swing::ProgressMonitor$TimerListener : public ::java::lang::Object
+{
+
+public: // actually package-private
+  ProgressMonitor$TimerListener(::javax::swing::ProgressMonitor *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  jlong __attribute__((aligned(__alignof__( ::java::lang::Object)))) timestamp;
+  jint lastProgress;
+  jboolean first;
+  ::javax::swing::ProgressMonitor * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_ProgressMonitor$TimerListener__
diff --git a/libjava/javax/swing/ProgressMonitor.h b/libjava/javax/swing/ProgressMonitor.h
new file mode 100644
index 000000000..6f5b072b6
--- /dev/null
+++ b/libjava/javax/swing/ProgressMonitor.h
@@ -0,0 +1,78 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_ProgressMonitor__
+#define __javax_swing_ProgressMonitor__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class JDialog;
+        class JLabel;
+        class JProgressBar;
+        class ProgressMonitor;
+        class Timer;
+    }
+  }
+}
+
+class javax::swing::ProgressMonitor : public ::java::lang::Object
+{
+
+public:
+  ProgressMonitor(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint, jint);
+  virtual void close();
+  virtual void setProgress(jint);
+  virtual jint getMinimum();
+  virtual void setMinimum(jint);
+  virtual jint getMaximum();
+  virtual void setMaximum(jint);
+  virtual jboolean isCanceled();
+  virtual jint getMillisToDecideToPopup();
+  virtual void setMillisToDecideToPopup(jint);
+  virtual jint getMillisToPopup();
+  virtual void setMillisToPopup(jint);
+  virtual ::java::lang::String * getNote();
+  virtual void setNote(::java::lang::String *);
+public: // actually package-private
+  virtual void createDialog();
+public:
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+public: // actually protected
+  ::javax::accessibility::AccessibleContext * __attribute__((aligned(__alignof__( ::java::lang::Object)))) accessibleContext;
+public: // actually package-private
+  ::java::awt::Component * component;
+  ::java::lang::String * note;
+  ::java::lang::Object * message;
+  jint millisToDecideToPopup;
+  jint millisToPopup;
+  jint min;
+  jint max;
+  jint progress;
+  ::javax::swing::JProgressBar * progressBar;
+  ::javax::swing::JLabel * noteLabel;
+  ::javax::swing::JDialog * progressDialog;
+  ::javax::swing::Timer * timer;
+  jboolean canceled;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_ProgressMonitor__
diff --git a/libjava/javax/swing/ProgressMonitorInputStream.h b/libjava/javax/swing/ProgressMonitorInputStream.h
new file mode 100644
index 000000000..2f4f555b8
--- /dev/null
+++ b/libjava/javax/swing/ProgressMonitorInputStream.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_ProgressMonitorInputStream__
+#define __javax_swing_ProgressMonitorInputStream__
+
+#pragma interface
+
+#include <java/io/FilterInputStream.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ProgressMonitor;
+        class ProgressMonitorInputStream;
+    }
+  }
+}
+
+class javax::swing::ProgressMonitorInputStream : public ::java::io::FilterInputStream
+{
+
+public:
+  ProgressMonitorInputStream(::java::awt::Component *, ::java::lang::Object *, ::java::io::InputStream *);
+  virtual void reset();
+  virtual jint read();
+  virtual jint read(JArray< jbyte > *);
+  virtual jint read(JArray< jbyte > *, jint, jint);
+  virtual jlong skip(jlong);
+  virtual void close();
+  virtual ::javax::swing::ProgressMonitor * getProgressMonitor();
+private:
+  void checkMonitorCanceled();
+  ::javax::swing::ProgressMonitor * __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) monitor;
+  jint read__;
+public: // actually package-private
+  static jboolean $assertionsDisabled;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_ProgressMonitorInputStream__
diff --git a/libjava/javax/swing/Renderer.h b/libjava/javax/swing/Renderer.h
new file mode 100644
index 000000000..de6ca6c72
--- /dev/null
+++ b/libjava/javax/swing/Renderer.h
@@ -0,0 +1,37 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_Renderer__
+#define __javax_swing_Renderer__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Renderer;
+    }
+  }
+}
+
+class javax::swing::Renderer : public ::java::lang::Object
+{
+
+public:
+  virtual void setValue(::java::lang::Object *, jboolean) = 0;
+  virtual ::java::awt::Component * getComponent() = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_Renderer__
diff --git a/libjava/javax/swing/RepaintManager$RepaintWorker.h b/libjava/javax/swing/RepaintManager$RepaintWorker.h
new file mode 100644
index 000000000..ba38b995d
--- /dev/null
+++ b/libjava/javax/swing/RepaintManager$RepaintWorker.h
@@ -0,0 +1,37 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_RepaintManager$RepaintWorker__
+#define __javax_swing_RepaintManager$RepaintWorker__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class RepaintManager;
+        class RepaintManager$RepaintWorker;
+    }
+  }
+}
+
+class javax::swing::RepaintManager$RepaintWorker : public ::java::lang::Object
+{
+
+public:
+  RepaintManager$RepaintWorker(::javax::swing::RepaintManager *);
+  virtual void setLive(jboolean);
+  virtual jboolean isLive();
+  virtual void run();
+public: // actually package-private
+  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) live;
+  ::javax::swing::RepaintManager * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_RepaintManager$RepaintWorker__
diff --git a/libjava/javax/swing/RepaintManager$RepaintWorkerEvent.h b/libjava/javax/swing/RepaintManager$RepaintWorkerEvent.h
new file mode 100644
index 000000000..7b68871bd
--- /dev/null
+++ b/libjava/javax/swing/RepaintManager$RepaintWorkerEvent.h
@@ -0,0 +1,30 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_RepaintManager$RepaintWorkerEvent__
+#define __javax_swing_RepaintManager$RepaintWorkerEvent__
+
+#pragma interface
+
+#include <java/awt/event/InvocationEvent.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class RepaintManager$RepaintWorkerEvent;
+    }
+  }
+}
+
+class javax::swing::RepaintManager$RepaintWorkerEvent : public ::java::awt::event::InvocationEvent
+{
+
+public:
+  RepaintManager$RepaintWorkerEvent(::java::lang::Object *, ::java::lang::Runnable *, ::java::lang::Object *, jboolean);
+  virtual void dispatch();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_RepaintManager$RepaintWorkerEvent__
diff --git a/libjava/javax/swing/RepaintManager.h b/libjava/javax/swing/RepaintManager.h
new file mode 100644
index 000000000..c599a47cc
--- /dev/null
+++ b/libjava/javax/swing/RepaintManager.h
@@ -0,0 +1,80 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_RepaintManager__
+#define __javax_swing_RepaintManager__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Dimension;
+        class Image;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class RepaintManager;
+        class RepaintManager$RepaintWorker;
+    }
+  }
+}
+
+class javax::swing::RepaintManager : public ::java::lang::Object
+{
+
+public:
+  RepaintManager();
+  static ::javax::swing::RepaintManager * currentManager(::java::awt::Component *);
+  static ::javax::swing::RepaintManager * currentManager(::javax::swing::JComponent *);
+  static void setCurrentManager(::javax::swing::RepaintManager *);
+  virtual void addInvalidComponent(::javax::swing::JComponent *);
+  virtual void removeInvalidComponent(::javax::swing::JComponent *);
+  virtual void addDirtyRegion(::javax::swing::JComponent *, jint, jint, jint, jint);
+  virtual ::java::awt::Rectangle * getDirtyRegion(::javax::swing::JComponent *);
+  virtual void markCompletelyDirty(::javax::swing::JComponent *);
+  virtual void markCompletelyClean(::javax::swing::JComponent *);
+  virtual jboolean isCompletelyDirty(::javax::swing::JComponent *);
+  virtual void validateInvalidComponents();
+  virtual void paintDirtyRegions();
+private:
+  void compileRepaintRoots(::java::util::HashMap *, ::javax::swing::JComponent *, ::java::util::HashSet *);
+public:
+  virtual ::java::awt::Image * getOffscreenBuffer(::java::awt::Component *, jint, jint);
+public: // actually package-private
+  virtual void commitBuffer(::java::awt::Component *, jint, jint, jint, jint);
+public:
+  virtual ::java::awt::Image * getVolatileOffscreenBuffer(::java::awt::Component *, jint, jint);
+  virtual ::java::awt::Dimension * getDoubleBufferMaximumSize();
+  virtual void setDoubleBufferMaximumSize(::java::awt::Dimension *);
+  virtual void setDoubleBufferingEnabled(jboolean);
+  virtual jboolean isDoubleBufferingEnabled();
+  virtual ::java::lang::String * toString();
+private:
+  void invokeLater(::java::lang::Runnable *);
+public: // actually package-private
+  static ::java::util::WeakHashMap * currentRepaintManagers;
+private:
+  static ::java::awt::Rectangle * rectCache;
+  ::java::util::HashMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) dirtyComponents;
+  ::java::util::HashMap * dirtyComponentsWork;
+  ::javax::swing::RepaintManager$RepaintWorker * repaintWorker;
+  ::java::util::ArrayList * invalidComponents;
+  jboolean doubleBufferingEnabled;
+  ::java::util::WeakHashMap * offscreenBuffers;
+  ::java::awt::Dimension * doubleBufferMaximumSize;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_RepaintManager__
diff --git a/libjava/javax/swing/RootPaneContainer.h b/libjava/javax/swing/RootPaneContainer.h
new file mode 100644
index 000000000..9318d8bc1
--- /dev/null
+++ b/libjava/javax/swing/RootPaneContainer.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_RootPaneContainer__
+#define __javax_swing_RootPaneContainer__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JLayeredPane;
+        class JRootPane;
+        class RootPaneContainer;
+    }
+  }
+}
+
+class javax::swing::RootPaneContainer : public ::java::lang::Object
+{
+
+public:
+  virtual ::javax::swing::JRootPane * getRootPane() = 0;
+  virtual void setContentPane(::java::awt::Container *) = 0;
+  virtual ::java::awt::Container * getContentPane() = 0;
+  virtual void setLayeredPane(::javax::swing::JLayeredPane *) = 0;
+  virtual ::javax::swing::JLayeredPane * getLayeredPane() = 0;
+  virtual void setGlassPane(::java::awt::Component *) = 0;
+  virtual ::java::awt::Component * getGlassPane() = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_RootPaneContainer__
diff --git a/libjava/javax/swing/ScrollPaneConstants.h b/libjava/javax/swing/ScrollPaneConstants.h
new file mode 100644
index 000000000..830a49f02
--- /dev/null
+++ b/libjava/javax/swing/ScrollPaneConstants.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_ScrollPaneConstants__
+#define __javax_swing_ScrollPaneConstants__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class ScrollPaneConstants;
+    }
+  }
+}
+
+class javax::swing::ScrollPaneConstants : public ::java::lang::Object
+{
+
+public:
+  static ::java::lang::String * VIEWPORT;
+  static ::java::lang::String * VERTICAL_SCROLLBAR;
+  static ::java::lang::String * HORIZONTAL_SCROLLBAR;
+  static ::java::lang::String * ROW_HEADER;
+  static ::java::lang::String * COLUMN_HEADER;
+  static ::java::lang::String * LOWER_LEFT_CORNER;
+  static ::java::lang::String * LOWER_RIGHT_CORNER;
+  static ::java::lang::String * UPPER_LEFT_CORNER;
+  static ::java::lang::String * UPPER_RIGHT_CORNER;
+  static ::java::lang::String * LOWER_LEADING_CORNER;
+  static ::java::lang::String * LOWER_TRAILING_CORNER;
+  static ::java::lang::String * UPPER_LEADING_CORNER;
+  static ::java::lang::String * UPPER_TRAILING_CORNER;
+  static ::java::lang::String * VERTICAL_SCROLLBAR_POLICY;
+  static ::java::lang::String * HORIZONTAL_SCROLLBAR_POLICY;
+  static const jint VERTICAL_SCROLLBAR_AS_NEEDED = 20;
+  static const jint VERTICAL_SCROLLBAR_NEVER = 21;
+  static const jint VERTICAL_SCROLLBAR_ALWAYS = 22;
+  static const jint HORIZONTAL_SCROLLBAR_AS_NEEDED = 30;
+  static const jint HORIZONTAL_SCROLLBAR_NEVER = 31;
+  static const jint HORIZONTAL_SCROLLBAR_ALWAYS = 32;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_ScrollPaneConstants__
diff --git a/libjava/javax/swing/ScrollPaneLayout$UIResource.h b/libjava/javax/swing/ScrollPaneLayout$UIResource.h
new file mode 100644
index 000000000..24c0fab64
--- /dev/null
+++ b/libjava/javax/swing/ScrollPaneLayout$UIResource.h
@@ -0,0 +1,29 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_ScrollPaneLayout$UIResource__
+#define __javax_swing_ScrollPaneLayout$UIResource__
+
+#pragma interface
+
+#include <javax/swing/ScrollPaneLayout.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class ScrollPaneLayout$UIResource;
+    }
+  }
+}
+
+class javax::swing::ScrollPaneLayout$UIResource : public ::javax::swing::ScrollPaneLayout
+{
+
+public:
+  ScrollPaneLayout$UIResource();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_ScrollPaneLayout$UIResource__
diff --git a/libjava/javax/swing/ScrollPaneLayout.h b/libjava/javax/swing/ScrollPaneLayout.h
new file mode 100644
index 000000000..d0fe81780
--- /dev/null
+++ b/libjava/javax/swing/ScrollPaneLayout.h
@@ -0,0 +1,77 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_ScrollPaneLayout__
+#define __javax_swing_ScrollPaneLayout__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JScrollBar;
+        class JScrollPane;
+        class JViewport;
+        class ScrollPaneLayout;
+    }
+  }
+}
+
+class javax::swing::ScrollPaneLayout : public ::java::lang::Object
+{
+
+public:
+  ScrollPaneLayout();
+  virtual void syncWithScrollPane(::javax::swing::JScrollPane *);
+public: // actually protected
+  virtual ::java::awt::Component * addSingletonComponent(::java::awt::Component *, ::java::awt::Component *);
+public:
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+  virtual void removeLayoutComponent(::java::awt::Component *);
+  virtual jint getVerticalScrollBarPolicy();
+  virtual void setVerticalScrollBarPolicy(jint);
+  virtual jint getHorizontalScrollBarPolicy();
+  virtual void setHorizontalScrollBarPolicy(jint);
+  virtual ::javax::swing::JViewport * getViewport();
+  virtual ::javax::swing::JScrollBar * getHorizontalScrollBar();
+  virtual ::javax::swing::JScrollBar * getVerticalScrollBar();
+  virtual ::javax::swing::JViewport * getRowHeader();
+  virtual ::javax::swing::JViewport * getColumnHeader();
+  virtual ::java::awt::Component * getCorner(::java::lang::String *);
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual void layoutContainer(::java::awt::Container *);
+  virtual ::java::awt::Rectangle * getViewportBorderBounds(::javax::swing::JScrollPane *);
+private:
+  static const jlong serialVersionUID = -4480022884523193743LL;
+public: // actually protected
+  ::javax::swing::JViewport * __attribute__((aligned(__alignof__( ::java::lang::Object)))) viewport;
+  ::javax::swing::JScrollBar * vsb;
+  ::javax::swing::JScrollBar * hsb;
+  ::javax::swing::JViewport * rowHead;
+  ::javax::swing::JViewport * colHead;
+  ::java::awt::Component * lowerLeft;
+  ::java::awt::Component * lowerRight;
+  ::java::awt::Component * upperLeft;
+  ::java::awt::Component * upperRight;
+  jint vsbPolicy;
+  jint hsbPolicy;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_ScrollPaneLayout__
diff --git a/libjava/javax/swing/Scrollable.h b/libjava/javax/swing/Scrollable.h
new file mode 100644
index 000000000..7030c9265
--- /dev/null
+++ b/libjava/javax/swing/Scrollable.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_Scrollable__
+#define __javax_swing_Scrollable__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Scrollable;
+    }
+  }
+}
+
+class javax::swing::Scrollable : public ::java::lang::Object
+{
+
+public:
+  virtual ::java::awt::Dimension * getPreferredScrollableViewportSize() = 0;
+  virtual jint getScrollableUnitIncrement(::java::awt::Rectangle *, jint, jint) = 0;
+  virtual jint getScrollableBlockIncrement(::java::awt::Rectangle *, jint, jint) = 0;
+  virtual jboolean getScrollableTracksViewportWidth() = 0;
+  virtual jboolean getScrollableTracksViewportHeight() = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_Scrollable__
diff --git a/libjava/javax/swing/SingleSelectionModel.h b/libjava/javax/swing/SingleSelectionModel.h
new file mode 100644
index 000000000..f8120e111
--- /dev/null
+++ b/libjava/javax/swing/SingleSelectionModel.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_SingleSelectionModel__
+#define __javax_swing_SingleSelectionModel__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class SingleSelectionModel;
+      namespace event
+      {
+          class ChangeListener;
+      }
+    }
+  }
+}
+
+class javax::swing::SingleSelectionModel : public ::java::lang::Object
+{
+
+public:
+  virtual jint getSelectedIndex() = 0;
+  virtual void setSelectedIndex(jint) = 0;
+  virtual void clearSelection() = 0;
+  virtual jboolean isSelected() = 0;
+  virtual void addChangeListener(::javax::swing::event::ChangeListener *) = 0;
+  virtual void removeChangeListener(::javax::swing::event::ChangeListener *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_SingleSelectionModel__
diff --git a/libjava/javax/swing/SizeRequirements.h b/libjava/javax/swing/SizeRequirements.h
new file mode 100644
index 000000000..7a9672a77
--- /dev/null
+++ b/libjava/javax/swing/SizeRequirements.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_SizeRequirements__
+#define __javax_swing_SizeRequirements__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class SizeRequirements;
+    }
+  }
+}
+
+class javax::swing::SizeRequirements : public ::java::lang::Object
+{
+
+public:
+  SizeRequirements();
+  SizeRequirements(jint, jint, jint, jfloat);
+  virtual ::java::lang::String * toString();
+  static ::javax::swing::SizeRequirements * getTiledSizeRequirements(JArray< ::javax::swing::SizeRequirements * > *);
+  static ::javax::swing::SizeRequirements * getAlignedSizeRequirements(JArray< ::javax::swing::SizeRequirements * > *);
+  static void calculateTiledPositions(jint, ::javax::swing::SizeRequirements *, JArray< ::javax::swing::SizeRequirements * > *, JArray< jint > *, JArray< jint > *);
+  static void calculateTiledPositions(jint, ::javax::swing::SizeRequirements *, JArray< ::javax::swing::SizeRequirements * > *, JArray< jint > *, JArray< jint > *, jboolean);
+private:
+  static void adjustSmaller(jint, JArray< ::javax::swing::SizeRequirements * > *, JArray< jint > *, jint);
+  static void adjustGreater(jint, JArray< ::javax::swing::SizeRequirements * > *, JArray< jint > *, jint);
+public:
+  static void calculateAlignedPositions(jint, ::javax::swing::SizeRequirements *, JArray< ::javax::swing::SizeRequirements * > *, JArray< jint > *, JArray< jint > *);
+  static void calculateAlignedPositions(jint, ::javax::swing::SizeRequirements *, JArray< ::javax::swing::SizeRequirements * > *, JArray< jint > *, JArray< jint > *, jboolean);
+private:
+  static void adjustFromRight(::javax::swing::SizeRequirements *, jfloat, jint, JArray< jint > *);
+  static void adjustFromLeft(::javax::swing::SizeRequirements *, jfloat, jint, JArray< jint > *);
+public:
+  static JArray< jint > * adjustSizes(jint, JArray< ::javax::swing::SizeRequirements * > *);
+private:
+  static const jlong serialVersionUID = 9217749429906736553LL;
+public:
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) minimum;
+  jint preferred;
+  jint maximum;
+  jfloat alignment;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_SizeRequirements__
diff --git a/libjava/javax/swing/SizeSequence.h b/libjava/javax/swing/SizeSequence.h
new file mode 100644
index 000000000..8bae12cf6
--- /dev/null
+++ b/libjava/javax/swing/SizeSequence.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_SizeSequence__
+#define __javax_swing_SizeSequence__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class SizeSequence;
+    }
+  }
+}
+
+class javax::swing::SizeSequence : public ::java::lang::Object
+{
+
+public:
+  SizeSequence();
+  SizeSequence(jint);
+  SizeSequence(jint, jint);
+  SizeSequence(JArray< jint > *);
+  virtual void setSize(jint, jint);
+  virtual jint getIndex(jint);
+  virtual jint getSize(jint);
+  virtual void setSizes(JArray< jint > *);
+  virtual JArray< jint > * getSizes();
+  virtual jint getPosition(jint);
+  virtual void insertEntries(jint, jint, jint);
+  virtual void removeEntries(jint, jint);
+private:
+  JArray< jint > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) sizes;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_SizeSequence__
diff --git a/libjava/javax/swing/SortingFocusTraversalPolicy.h b/libjava/javax/swing/SortingFocusTraversalPolicy.h
new file mode 100644
index 000000000..fc3d570b6
--- /dev/null
+++ b/libjava/javax/swing/SortingFocusTraversalPolicy.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_SortingFocusTraversalPolicy__
+#define __javax_swing_SortingFocusTraversalPolicy__
+
+#pragma interface
+
+#include <javax/swing/InternalFrameFocusTraversalPolicy.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class SortingFocusTraversalPolicy;
+    }
+  }
+}
+
+class javax::swing::SortingFocusTraversalPolicy : public ::javax::swing::InternalFrameFocusTraversalPolicy
+{
+
+public: // actually protected
+  SortingFocusTraversalPolicy();
+public:
+  SortingFocusTraversalPolicy(::java::util::Comparator *);
+public: // actually protected
+  virtual jboolean accept(::java::awt::Component *);
+  virtual ::java::util::Comparator * getComparator();
+  virtual void setComparator(::java::util::Comparator *);
+private:
+  ::java::util::TreeSet * getSortedCycle(::java::awt::Container *, ::java::util::TreeSet *);
+public:
+  virtual ::java::awt::Component * getComponentAfter(::java::awt::Container *, ::java::awt::Component *);
+  virtual ::java::awt::Component * getComponentBefore(::java::awt::Container *, ::java::awt::Component *);
+  virtual ::java::awt::Component * getDefaultComponent(::java::awt::Container *);
+  virtual ::java::awt::Component * getFirstComponent(::java::awt::Container *);
+  virtual ::java::awt::Component * getLastComponent(::java::awt::Container *);
+  virtual jboolean getImplicitDownCycleTraversal();
+  virtual void setImplicitDownCycleTraversal(jboolean);
+public: // actually package-private
+  ::java::util::Comparator * __attribute__((aligned(__alignof__( ::javax::swing::InternalFrameFocusTraversalPolicy)))) comparator;
+  jboolean implicitDownCycleTraversal;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_SortingFocusTraversalPolicy__
diff --git a/libjava/javax/swing/SpinnerDateModel.h b/libjava/javax/swing/SpinnerDateModel.h
new file mode 100644
index 000000000..ae25fbe4c
--- /dev/null
+++ b/libjava/javax/swing/SpinnerDateModel.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_SpinnerDateModel__
+#define __javax_swing_SpinnerDateModel__
+
+#pragma interface
+
+#include <javax/swing/AbstractSpinnerModel.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class SpinnerDateModel;
+    }
+  }
+}
+
+class javax::swing::SpinnerDateModel : public ::javax::swing::AbstractSpinnerModel
+{
+
+public:
+  SpinnerDateModel();
+  SpinnerDateModel(::java::util::Date *, ::java::lang::Comparable *, ::java::lang::Comparable *, jint);
+  virtual jint getCalendarField();
+  virtual ::java::util::Date * getDate();
+  virtual ::java::lang::Comparable * getStart();
+  virtual ::java::lang::Comparable * getEnd();
+  virtual ::java::lang::Object * getValue();
+  virtual ::java::lang::Object * getNextValue();
+  virtual ::java::lang::Object * getPreviousValue();
+  virtual void setCalendarField(jint);
+  virtual void setStart(::java::lang::Comparable *);
+  virtual void setEnd(::java::lang::Comparable *);
+  virtual void setValue(::java::lang::Object *);
+private:
+  ::java::util::Calendar * __attribute__((aligned(__alignof__( ::javax::swing::AbstractSpinnerModel)))) date;
+  ::java::lang::Comparable * start;
+  ::java::lang::Comparable * end;
+  jint calendarField;
+  static const jlong serialVersionUID = -4802518107105940612LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_SpinnerDateModel__
diff --git a/libjava/javax/swing/SpinnerListModel.h b/libjava/javax/swing/SpinnerListModel.h
new file mode 100644
index 000000000..b5a65939e
--- /dev/null
+++ b/libjava/javax/swing/SpinnerListModel.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_SpinnerListModel__
+#define __javax_swing_SpinnerListModel__
+
+#pragma interface
+
+#include <javax/swing/AbstractSpinnerModel.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class SpinnerListModel;
+    }
+  }
+}
+
+class javax::swing::SpinnerListModel : public ::javax::swing::AbstractSpinnerModel
+{
+
+public:
+  SpinnerListModel();
+  SpinnerListModel(::java::util::List *);
+  SpinnerListModel(JArray< ::java::lang::Object * > *);
+  virtual ::java::util::List * getList();
+  virtual ::java::lang::Object * getNextValue();
+  virtual ::java::lang::Object * getPreviousValue();
+  virtual ::java::lang::Object * getValue();
+  virtual void setList(::java::util::List *);
+  virtual void setValue(::java::lang::Object *);
+private:
+  static const jlong serialVersionUID = 3358804052191994516LL;
+  ::java::util::List * __attribute__((aligned(__alignof__( ::javax::swing::AbstractSpinnerModel)))) list;
+  jint index;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_SpinnerListModel__
diff --git a/libjava/javax/swing/SpinnerModel.h b/libjava/javax/swing/SpinnerModel.h
new file mode 100644
index 000000000..c762ac64a
--- /dev/null
+++ b/libjava/javax/swing/SpinnerModel.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_SpinnerModel__
+#define __javax_swing_SpinnerModel__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class SpinnerModel;
+      namespace event
+      {
+          class ChangeListener;
+      }
+    }
+  }
+}
+
+class javax::swing::SpinnerModel : public ::java::lang::Object
+{
+
+public:
+  virtual void setValue(::java::lang::Object *) = 0;
+  virtual ::java::lang::Object * getValue() = 0;
+  virtual ::java::lang::Object * getNextValue() = 0;
+  virtual ::java::lang::Object * getPreviousValue() = 0;
+  virtual void addChangeListener(::javax::swing::event::ChangeListener *) = 0;
+  virtual void removeChangeListener(::javax::swing::event::ChangeListener *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_SpinnerModel__
diff --git a/libjava/javax/swing/SpinnerNumberModel.h b/libjava/javax/swing/SpinnerNumberModel.h
new file mode 100644
index 000000000..185205472
--- /dev/null
+++ b/libjava/javax/swing/SpinnerNumberModel.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_SpinnerNumberModel__
+#define __javax_swing_SpinnerNumberModel__
+
+#pragma interface
+
+#include <javax/swing/AbstractSpinnerModel.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class SpinnerNumberModel;
+    }
+  }
+}
+
+class javax::swing::SpinnerNumberModel : public ::javax::swing::AbstractSpinnerModel
+{
+
+public:
+  SpinnerNumberModel();
+  SpinnerNumberModel(jdouble, jdouble, jdouble, jdouble);
+  SpinnerNumberModel(jint, jint, jint, jint);
+  SpinnerNumberModel(::java::lang::Number *, ::java::lang::Comparable *, ::java::lang::Comparable *, ::java::lang::Number *);
+  virtual void setValue(::java::lang::Object *);
+  virtual ::java::lang::Object * getValue();
+  virtual ::java::lang::Object * getNextValue();
+  virtual ::java::lang::Object * getPreviousValue();
+  virtual ::java::lang::Number * getNumber();
+  virtual ::java::lang::Comparable * getMinimum();
+  virtual void setMinimum(::java::lang::Comparable *);
+  virtual ::java::lang::Comparable * getMaximum();
+  virtual void setMaximum(::java::lang::Comparable *);
+  virtual ::java::lang::Number * getStepSize();
+  virtual void setStepSize(::java::lang::Number *);
+private:
+  static const jlong serialVersionUID = 7279176385485777821LL;
+  ::java::lang::Number * __attribute__((aligned(__alignof__( ::javax::swing::AbstractSpinnerModel)))) value;
+  ::java::lang::Comparable * minimum;
+  ::java::lang::Comparable * maximum;
+  ::java::lang::Number * stepSize;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_SpinnerNumberModel__
diff --git a/libjava/javax/swing/Spring$1.h b/libjava/javax/swing/Spring$1.h
new file mode 100644
index 000000000..5d5dd90ab
--- /dev/null
+++ b/libjava/javax/swing/Spring$1.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_Spring$1__
+#define __javax_swing_Spring$1__
+
+#pragma interface
+
+#include <javax/swing/Spring.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class Spring;
+        class Spring$1;
+    }
+  }
+}
+
+class javax::swing::Spring$1 : public ::javax::swing::Spring
+{
+
+public: // actually package-private
+  Spring$1(jfloat, ::javax::swing::Spring *);
+public:
+  virtual jint getMaximumValue();
+  virtual jint getMinimumValue();
+  virtual jint getPreferredValue();
+  virtual jint getValue();
+  virtual void setValue(jint);
+private:
+  jfloat __attribute__((aligned(__alignof__( ::javax::swing::Spring)))) val$factor;
+  ::javax::swing::Spring * val$spring;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_Spring$1__
diff --git a/libjava/javax/swing/Spring$2.h b/libjava/javax/swing/Spring$2.h
new file mode 100644
index 000000000..acfc8884b
--- /dev/null
+++ b/libjava/javax/swing/Spring$2.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_Spring$2__
+#define __javax_swing_Spring$2__
+
+#pragma interface
+
+#include <javax/swing/Spring.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Spring$2;
+    }
+  }
+}
+
+class javax::swing::Spring$2 : public ::javax::swing::Spring
+{
+
+public: // actually package-private
+  Spring$2(::java::awt::Component *);
+public:
+  virtual jint getMaximumValue();
+  virtual jint getMinimumValue();
+  virtual jint getPreferredValue();
+  virtual jint getValue();
+  virtual void setValue(jint);
+private:
+  ::java::awt::Component * __attribute__((aligned(__alignof__( ::javax::swing::Spring)))) val$component;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_Spring$2__
diff --git a/libjava/javax/swing/Spring$3.h b/libjava/javax/swing/Spring$3.h
new file mode 100644
index 000000000..74b820aba
--- /dev/null
+++ b/libjava/javax/swing/Spring$3.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_Spring$3__
+#define __javax_swing_Spring$3__
+
+#pragma interface
+
+#include <javax/swing/Spring.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Spring$3;
+    }
+  }
+}
+
+class javax::swing::Spring$3 : public ::javax::swing::Spring
+{
+
+public: // actually package-private
+  Spring$3(::java::awt::Component *);
+public:
+  virtual jint getMaximumValue();
+  virtual jint getMinimumValue();
+  virtual jint getPreferredValue();
+  virtual jint getValue();
+  virtual void setValue(jint);
+private:
+  ::java::awt::Component * __attribute__((aligned(__alignof__( ::javax::swing::Spring)))) val$component;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_Spring$3__
diff --git a/libjava/javax/swing/Spring$AddSpring.h b/libjava/javax/swing/Spring$AddSpring.h
new file mode 100644
index 000000000..9c455fead
--- /dev/null
+++ b/libjava/javax/swing/Spring$AddSpring.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_Spring$AddSpring__
+#define __javax_swing_Spring$AddSpring__
+
+#pragma interface
+
+#include <javax/swing/Spring.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class Spring;
+        class Spring$AddSpring;
+    }
+  }
+}
+
+class javax::swing::Spring$AddSpring : public ::javax::swing::Spring
+{
+
+public:
+  ::java::lang::String * toString();
+public: // actually protected
+  Spring$AddSpring(::javax::swing::Spring *, ::javax::swing::Spring *);
+public:
+  jint getMaximumValue();
+  jint getMinimumValue();
+  jint getPreferredValue();
+  jint getValue();
+  void setValue(jint);
+private:
+  ::javax::swing::Spring * __attribute__((aligned(__alignof__( ::javax::swing::Spring)))) s1;
+  ::javax::swing::Spring * s2;
+  jint value;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_Spring$AddSpring__
diff --git a/libjava/javax/swing/Spring$MaxSpring.h b/libjava/javax/swing/Spring$MaxSpring.h
new file mode 100644
index 000000000..c3272b2ce
--- /dev/null
+++ b/libjava/javax/swing/Spring$MaxSpring.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_Spring$MaxSpring__
+#define __javax_swing_Spring$MaxSpring__
+
+#pragma interface
+
+#include <javax/swing/Spring.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class Spring;
+        class Spring$MaxSpring;
+    }
+  }
+}
+
+class javax::swing::Spring$MaxSpring : public ::javax::swing::Spring
+{
+
+public:
+  ::java::lang::String * toString();
+public: // actually protected
+  Spring$MaxSpring(::javax::swing::Spring *, ::javax::swing::Spring *);
+public:
+  jint getMaximumValue();
+  jint getMinimumValue();
+  jint getPreferredValue();
+  jint getValue();
+  void setValue(jint);
+private:
+  ::javax::swing::Spring * __attribute__((aligned(__alignof__( ::javax::swing::Spring)))) s1;
+  ::javax::swing::Spring * s2;
+  jint value;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_Spring$MaxSpring__
diff --git a/libjava/javax/swing/Spring$MinusSpring.h b/libjava/javax/swing/Spring$MinusSpring.h
new file mode 100644
index 000000000..7b74f6613
--- /dev/null
+++ b/libjava/javax/swing/Spring$MinusSpring.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_Spring$MinusSpring__
+#define __javax_swing_Spring$MinusSpring__
+
+#pragma interface
+
+#include <javax/swing/Spring.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class Spring;
+        class Spring$MinusSpring;
+    }
+  }
+}
+
+class javax::swing::Spring$MinusSpring : public ::javax::swing::Spring
+{
+
+public:
+  ::java::lang::String * toString();
+public: // actually protected
+  Spring$MinusSpring(::javax::swing::Spring *);
+public:
+  jint getMaximumValue();
+  jint getMinimumValue();
+  jint getPreferredValue();
+  jint getValue();
+  void setValue(jint);
+private:
+  ::javax::swing::Spring * __attribute__((aligned(__alignof__( ::javax::swing::Spring)))) s;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_Spring$MinusSpring__
diff --git a/libjava/javax/swing/Spring$SimpleSpring.h b/libjava/javax/swing/Spring$SimpleSpring.h
new file mode 100644
index 000000000..b28437cca
--- /dev/null
+++ b/libjava/javax/swing/Spring$SimpleSpring.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_Spring$SimpleSpring__
+#define __javax_swing_Spring$SimpleSpring__
+
+#pragma interface
+
+#include <javax/swing/Spring.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class Spring$SimpleSpring;
+    }
+  }
+}
+
+class javax::swing::Spring$SimpleSpring : public ::javax::swing::Spring
+{
+
+public:
+  ::java::lang::String * toString();
+  Spring$SimpleSpring(jint, jint, jint);
+  jint getMaximumValue();
+  jint getMinimumValue();
+  jint getPreferredValue();
+  jint getValue();
+  void setValue(jint);
+private:
+  jint __attribute__((aligned(__alignof__( ::javax::swing::Spring)))) min;
+  jint pref;
+  jint max;
+  jint value;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_Spring$SimpleSpring__
diff --git a/libjava/javax/swing/Spring.h b/libjava/javax/swing/Spring.h
new file mode 100644
index 000000000..9459f630f
--- /dev/null
+++ b/libjava/javax/swing/Spring.h
@@ -0,0 +1,58 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_Spring__
+#define __javax_swing_Spring__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Spring;
+    }
+  }
+}
+
+class javax::swing::Spring : public ::java::lang::Object
+{
+
+public: // actually protected
+  Spring();
+public:
+  static ::javax::swing::Spring * constant(jint);
+  static ::javax::swing::Spring * constant(jint, jint, jint);
+  virtual jint getMaximumValue() = 0;
+  virtual jint getMinimumValue() = 0;
+  virtual jint getPreferredValue() = 0;
+  virtual jint getValue() = 0;
+  static ::javax::swing::Spring * max(::javax::swing::Spring *, ::javax::swing::Spring *);
+  static ::javax::swing::Spring * minus(::javax::swing::Spring *);
+  virtual void setValue(jint) = 0;
+private:
+  jint getShrinkRange();
+  jint getExpandRange();
+public: // actually package-private
+  virtual jdouble getStrain();
+  virtual void setStrain(jdouble);
+public:
+  static ::javax::swing::Spring * sum(::javax::swing::Spring *, ::javax::swing::Spring *);
+  static ::javax::swing::Spring * scale(::javax::swing::Spring *, jfloat);
+  static ::javax::swing::Spring * width(::java::awt::Component *);
+  static ::javax::swing::Spring * height(::java::awt::Component *);
+  static const jint UNSET = -2147483647 - 1;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_Spring__
diff --git a/libjava/javax/swing/SpringLayout$Constraints.h b/libjava/javax/swing/SpringLayout$Constraints.h
new file mode 100644
index 000000000..200318910
--- /dev/null
+++ b/libjava/javax/swing/SpringLayout$Constraints.h
@@ -0,0 +1,65 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_SpringLayout$Constraints__
+#define __javax_swing_SpringLayout$Constraints__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Spring;
+        class SpringLayout$Constraints;
+    }
+  }
+}
+
+class javax::swing::SpringLayout$Constraints : public ::java::lang::Object
+{
+
+public:
+  SpringLayout$Constraints();
+  SpringLayout$Constraints(::javax::swing::Spring *, ::javax::swing::Spring *);
+  SpringLayout$Constraints(::javax::swing::Spring *, ::javax::swing::Spring *, ::javax::swing::Spring *, ::javax::swing::Spring *);
+  SpringLayout$Constraints(::java::awt::Component *);
+  virtual ::javax::swing::Spring * getConstraint(::java::lang::String *);
+  virtual ::javax::swing::Spring * getHeight();
+  virtual ::javax::swing::Spring * getWidth();
+  virtual ::javax::swing::Spring * getX();
+  virtual ::javax::swing::Spring * getY();
+  virtual ::javax::swing::Spring * getSouth();
+  virtual ::javax::swing::Spring * getEast();
+  virtual void setConstraint(::java::lang::String *, ::javax::swing::Spring *);
+  virtual void setHeight(::javax::swing::Spring *);
+  virtual void setWidth(::javax::swing::Spring *);
+  virtual void setX(::javax::swing::Spring *);
+  virtual void setY(::javax::swing::Spring *);
+  virtual void setSouth(::javax::swing::Spring *);
+  virtual void setEast(::javax::swing::Spring *);
+  virtual void dropCalcResult();
+private:
+  ::javax::swing::Spring * __attribute__((aligned(__alignof__( ::java::lang::Object)))) x;
+  ::javax::swing::Spring * y;
+  ::javax::swing::Spring * height;
+  ::javax::swing::Spring * width;
+  ::javax::swing::Spring * east;
+  ::javax::swing::Spring * south;
+  ::javax::swing::Spring * v;
+  ::javax::swing::Spring * h;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_SpringLayout$Constraints__
diff --git a/libjava/javax/swing/SpringLayout$DeferredDimension.h b/libjava/javax/swing/SpringLayout$DeferredDimension.h
new file mode 100644
index 000000000..0d72960b2
--- /dev/null
+++ b/libjava/javax/swing/SpringLayout$DeferredDimension.h
@@ -0,0 +1,34 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_SpringLayout$DeferredDimension__
+#define __javax_swing_SpringLayout$DeferredDimension__
+
+#pragma interface
+
+#include <javax/swing/Spring.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class SpringLayout$DeferredDimension;
+    }
+  }
+}
+
+class javax::swing::SpringLayout$DeferredDimension : public ::javax::swing::Spring
+{
+
+public:
+  SpringLayout$DeferredDimension();
+  virtual void setValue(jint);
+  virtual jint getValue();
+private:
+  jint __attribute__((aligned(__alignof__( ::javax::swing::Spring)))) value;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_SpringLayout$DeferredDimension__
diff --git a/libjava/javax/swing/SpringLayout$DeferredHeight.h b/libjava/javax/swing/SpringLayout$DeferredHeight.h
new file mode 100644
index 000000000..c08de85b6
--- /dev/null
+++ b/libjava/javax/swing/SpringLayout$DeferredHeight.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_SpringLayout$DeferredHeight__
+#define __javax_swing_SpringLayout$DeferredHeight__
+
+#pragma interface
+
+#include <javax/swing/SpringLayout$DeferredDimension.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class SpringLayout$DeferredHeight;
+    }
+  }
+}
+
+class javax::swing::SpringLayout$DeferredHeight : public ::javax::swing::SpringLayout$DeferredDimension
+{
+
+public:
+  virtual ::java::lang::String * toString();
+  SpringLayout$DeferredHeight(::java::awt::Component *);
+  virtual jint getMaximumValue();
+  virtual jint getMinimumValue();
+  virtual jint getPreferredValue();
+private:
+  ::java::awt::Component * __attribute__((aligned(__alignof__( ::javax::swing::SpringLayout$DeferredDimension)))) c;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_SpringLayout$DeferredHeight__
diff --git a/libjava/javax/swing/SpringLayout$DeferredSpring.h b/libjava/javax/swing/SpringLayout$DeferredSpring.h
new file mode 100644
index 000000000..691515408
--- /dev/null
+++ b/libjava/javax/swing/SpringLayout$DeferredSpring.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_SpringLayout$DeferredSpring__
+#define __javax_swing_SpringLayout$DeferredSpring__
+
+#pragma interface
+
+#include <javax/swing/Spring.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Spring;
+        class SpringLayout;
+        class SpringLayout$DeferredSpring;
+    }
+  }
+}
+
+class javax::swing::SpringLayout$DeferredSpring : public ::javax::swing::Spring
+{
+
+public:
+  virtual ::java::lang::String * toString();
+  SpringLayout$DeferredSpring(::javax::swing::SpringLayout *, ::java::lang::String *, ::java::awt::Component *);
+private:
+  ::javax::swing::Spring * resolveSpring();
+public:
+  virtual jint getMaximumValue();
+  virtual jint getMinimumValue();
+  virtual jint getPreferredValue();
+  virtual jint getValue();
+  virtual void setValue(jint);
+private:
+  ::javax::swing::SpringLayout * __attribute__((aligned(__alignof__( ::javax::swing::Spring)))) sl;
+  ::java::lang::String * edgeName;
+  ::java::awt::Component * c;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_SpringLayout$DeferredSpring__
diff --git a/libjava/javax/swing/SpringLayout$DeferredWidth.h b/libjava/javax/swing/SpringLayout$DeferredWidth.h
new file mode 100644
index 000000000..fea7e4959
--- /dev/null
+++ b/libjava/javax/swing/SpringLayout$DeferredWidth.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_SpringLayout$DeferredWidth__
+#define __javax_swing_SpringLayout$DeferredWidth__
+
+#pragma interface
+
+#include <javax/swing/SpringLayout$DeferredDimension.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class SpringLayout$DeferredWidth;
+    }
+  }
+}
+
+class javax::swing::SpringLayout$DeferredWidth : public ::javax::swing::SpringLayout$DeferredDimension
+{
+
+public:
+  SpringLayout$DeferredWidth(::java::awt::Component *);
+  virtual ::java::lang::String * toString();
+  virtual jint getMaximumValue();
+  virtual jint getMinimumValue();
+  virtual jint getPreferredValue();
+private:
+  ::java::awt::Component * __attribute__((aligned(__alignof__( ::javax::swing::SpringLayout$DeferredDimension)))) c;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_SpringLayout$DeferredWidth__
diff --git a/libjava/javax/swing/SpringLayout.h b/libjava/javax/swing/SpringLayout.h
new file mode 100644
index 000000000..426d0d849
--- /dev/null
+++ b/libjava/javax/swing/SpringLayout.h
@@ -0,0 +1,64 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_SpringLayout__
+#define __javax_swing_SpringLayout__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Spring;
+        class SpringLayout;
+        class SpringLayout$Constraints;
+    }
+  }
+}
+
+class javax::swing::SpringLayout : public ::java::lang::Object
+{
+
+public:
+  SpringLayout();
+  virtual void addLayoutComponent(::java::awt::Component *, ::java::lang::Object *);
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+  virtual ::javax::swing::Spring * getConstraint(::java::lang::String *, ::java::awt::Component *);
+  virtual ::javax::swing::SpringLayout$Constraints * getConstraints(::java::awt::Component *);
+  virtual jfloat getLayoutAlignmentX(::java::awt::Container *);
+  virtual jfloat getLayoutAlignmentY(::java::awt::Container *);
+  virtual void invalidateLayout(::java::awt::Container *);
+private:
+  ::javax::swing::SpringLayout$Constraints * initContainer(::java::awt::Container *);
+public:
+  virtual void layoutContainer(::java::awt::Container *);
+  virtual ::java::awt::Dimension * maximumLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  virtual void putConstraint(::java::lang::String *, ::java::awt::Component *, jint, ::java::lang::String *, ::java::awt::Component *);
+  virtual void putConstraint(::java::lang::String *, ::java::awt::Component *, ::javax::swing::Spring *, ::java::lang::String *, ::java::awt::Component *);
+  virtual void removeLayoutComponent(::java::awt::Component *);
+  static ::java::lang::String * EAST;
+  static ::java::lang::String * NORTH;
+  static ::java::lang::String * SOUTH;
+  static ::java::lang::String * WEST;
+private:
+  ::java::util::Map * __attribute__((aligned(__alignof__( ::java::lang::Object)))) constraintsMap;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_SpringLayout__
diff --git a/libjava/javax/swing/SwingConstants.h b/libjava/javax/swing/SwingConstants.h
new file mode 100644
index 000000000..7ca0a9bcf
--- /dev/null
+++ b/libjava/javax/swing/SwingConstants.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_SwingConstants__
+#define __javax_swing_SwingConstants__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class SwingConstants;
+    }
+  }
+}
+
+class javax::swing::SwingConstants : public ::java::lang::Object
+{
+
+public:
+  static const jint CENTER = 0;
+  static const jint TOP = 1;
+  static const jint LEFT = 2;
+  static const jint BOTTOM = 3;
+  static const jint RIGHT = 4;
+  static const jint NORTH = 1;
+  static const jint NORTH_EAST = 2;
+  static const jint EAST = 3;
+  static const jint SOUTH_EAST = 4;
+  static const jint SOUTH = 5;
+  static const jint SOUTH_WEST = 6;
+  static const jint WEST = 7;
+  static const jint NORTH_WEST = 8;
+  static const jint HORIZONTAL = 0;
+  static const jint VERTICAL = 1;
+  static const jint LEADING = 10;
+  static const jint TRAILING = 11;
+  static const jint NEXT = 12;
+  static const jint PREVIOUS = 13;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_SwingConstants__
diff --git a/libjava/javax/swing/SwingUtilities$OwnerFrame.h b/libjava/javax/swing/SwingUtilities$OwnerFrame.h
new file mode 100644
index 000000000..deb4d8412
--- /dev/null
+++ b/libjava/javax/swing/SwingUtilities$OwnerFrame.h
@@ -0,0 +1,34 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_SwingUtilities$OwnerFrame__
+#define __javax_swing_SwingUtilities$OwnerFrame__
+
+#pragma interface
+
+#include <java/awt/Frame.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class SwingUtilities$OwnerFrame;
+    }
+  }
+}
+
+class javax::swing::SwingUtilities$OwnerFrame : public ::java::awt::Frame
+{
+
+  SwingUtilities$OwnerFrame();
+public:
+  virtual void setVisible(jboolean);
+  virtual jboolean isShowing();
+public: // actually package-private
+  SwingUtilities$OwnerFrame(::javax::swing::SwingUtilities$OwnerFrame *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_SwingUtilities$OwnerFrame__
diff --git a/libjava/javax/swing/SwingUtilities.h b/libjava/javax/swing/SwingUtilities.h
new file mode 100644
index 000000000..3f75d967f
--- /dev/null
+++ b/libjava/javax/swing/SwingUtilities.h
@@ -0,0 +1,124 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_SwingUtilities__
+#define __javax_swing_SwingUtilities__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class FontMetrics;
+        class Graphics;
+        class Point;
+        class Rectangle;
+        class Window;
+      namespace event
+      {
+          class KeyEvent;
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+        class AccessibleStateSet;
+    }
+    namespace swing
+    {
+        class Action;
+        class ActionMap;
+        class Icon;
+        class InputMap;
+        class JComponent;
+        class JRootPane;
+        class KeyStroke;
+        class SwingUtilities;
+        class SwingUtilities$OwnerFrame;
+    }
+  }
+}
+
+class javax::swing::SwingUtilities : public ::java::lang::Object
+{
+
+  SwingUtilities();
+public:
+  static ::java::awt::Rectangle * calculateInnerArea(::javax::swing::JComponent *, ::java::awt::Rectangle *);
+  static ::java::awt::Component * findFocusOwner(::java::awt::Component *);
+  static ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Component *, ::java::awt::Point *);
+  static ::javax::accessibility::Accessible * getAccessibleChild(::java::awt::Component *, jint);
+  static jint getAccessibleChildrenCount(::java::awt::Component *);
+  static jint getAccessibleIndexInParent(::java::awt::Component *);
+  static ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet(::java::awt::Component *);
+  static ::java::awt::Rectangle * getLocalBounds(::java::awt::Component *);
+  static ::javax::swing::JRootPane * getRootPane(::java::awt::Component *);
+  static ::java::awt::Container * getAncestorNamed(::java::lang::String *, ::java::awt::Component *);
+  static ::java::awt::Container * getAncestorOfClass(::java::lang::Class *, ::java::awt::Component *);
+  static ::java::awt::Window * getWindowAncestor(::java::awt::Component *);
+  static ::java::awt::Window * windowForComponent(::java::awt::Component *);
+  static ::java::awt::Component * getRoot(::java::awt::Component *);
+  static jboolean isDescendingFrom(::java::awt::Component *, ::java::awt::Component *);
+  static ::java::awt::Component * getDeepestComponentAt(::java::awt::Component *, jint, jint);
+  static void convertPointToScreen(::java::awt::Point *, ::java::awt::Component *);
+  static void convertPointFromScreen(::java::awt::Point *, ::java::awt::Component *);
+  static ::java::awt::Point * convertPoint(::java::awt::Component *, jint, jint, ::java::awt::Component *);
+  static ::java::awt::Point * convertPoint(::java::awt::Component *, ::java::awt::Point *, ::java::awt::Component *);
+  static ::java::awt::Rectangle * convertRectangle(::java::awt::Component *, ::java::awt::Rectangle *, ::java::awt::Component *);
+  static ::java::awt::event::MouseEvent * convertMouseEvent(::java::awt::Component *, ::java::awt::event::MouseEvent *, ::java::awt::Component *);
+  static void updateComponentTreeUI(::java::awt::Component *);
+private:
+  static void updateComponentTreeUIImpl(::java::awt::Component *);
+public:
+  static ::java::lang::String * layoutCompoundLabel(::javax::swing::JComponent *, ::java::awt::FontMetrics *, ::java::lang::String *, ::javax::swing::Icon *, jint, jint, jint, jint, ::java::awt::Rectangle *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, jint);
+  static ::java::lang::String * layoutCompoundLabel(::java::awt::FontMetrics *, ::java::lang::String *, ::javax::swing::Icon *, jint, jint, jint, jint, ::java::awt::Rectangle *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, jint);
+private:
+  static ::java::lang::String * layoutCompoundLabelImpl(::javax::swing::JComponent *, ::java::awt::FontMetrics *, ::java::lang::String *, ::javax::swing::Icon *, jint, jint, jint, jint, ::java::awt::Rectangle *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, jint);
+  static ::java::lang::String * clipString(::javax::swing::JComponent *, ::java::awt::FontMetrics *, ::java::lang::String *, jint);
+public:
+  static void invokeLater(::java::lang::Runnable *);
+  static void invokeAndWait(::java::lang::Runnable *);
+  static jboolean isEventDispatchThread();
+  static void paintComponent(::java::awt::Graphics *, ::java::awt::Component *, ::java::awt::Container *, jint, jint, jint, jint);
+  static void paintComponent(::java::awt::Graphics *, ::java::awt::Component *, ::java::awt::Container *, ::java::awt::Rectangle *);
+public: // actually package-private
+  static ::java::awt::Window * getOwnerFrame(::java::awt::Window *);
+public:
+  static jboolean isLeftMouseButton(::java::awt::event::MouseEvent *);
+  static jboolean isMiddleMouseButton(::java::awt::event::MouseEvent *);
+  static jboolean isRightMouseButton(::java::awt::event::MouseEvent *);
+  static jboolean notifyAction(::javax::swing::Action *, ::javax::swing::KeyStroke *, ::java::awt::event::KeyEvent *, ::java::lang::Object *, jint);
+  static void replaceUIActionMap(::javax::swing::JComponent *, ::javax::swing::ActionMap *);
+  static void replaceUIInputMap(::javax::swing::JComponent *, jint, ::javax::swing::InputMap *);
+  static JArray< ::java::awt::Rectangle * > * computeDifference(::java::awt::Rectangle *, ::java::awt::Rectangle *);
+  static ::java::awt::Rectangle * computeIntersection(jint, jint, jint, jint, ::java::awt::Rectangle *);
+  static jint computeStringWidth(::java::awt::FontMetrics *, ::java::lang::String *);
+  static ::java::awt::Rectangle * computeUnion(jint, jint, jint, jint, ::java::awt::Rectangle *);
+  static jboolean isRectangleContainingRectangle(::java::awt::Rectangle *, ::java::awt::Rectangle *);
+  static ::javax::swing::InputMap * getUIInputMap(::javax::swing::JComponent *, jint);
+  static ::javax::swing::ActionMap * getUIActionMap(::javax::swing::JComponent *);
+  static jboolean processKeyBindings(::java::awt::event::KeyEvent *);
+public: // actually package-private
+  static ::java::lang::String * convertHorizontalAlignmentCodeToString(jint);
+  static ::java::lang::String * convertVerticalAlignmentCodeToString(jint);
+  static ::java::lang::String * convertWindowConstantToString(jint);
+  static void convertRectangleToAncestor(::java::awt::Component *, ::java::awt::Rectangle *, ::java::awt::Component *);
+private:
+  static ::javax::swing::SwingUtilities$OwnerFrame * ownerFrame;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_SwingUtilities__
diff --git a/libjava/javax/swing/Timer$1.h b/libjava/javax/swing/Timer$1.h
new file mode 100644
index 000000000..0f4e056dc
--- /dev/null
+++ b/libjava/javax/swing/Timer$1.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_Timer$1__
+#define __javax_swing_Timer$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class Timer;
+        class Timer$1;
+    }
+  }
+}
+
+class javax::swing::Timer$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  Timer$1(::javax::swing::Timer *);
+public:
+  virtual void run();
+public: // actually package-private
+  ::javax::swing::Timer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_Timer$1__
diff --git a/libjava/javax/swing/Timer$Task.h b/libjava/javax/swing/Timer$Task.h
new file mode 100644
index 000000000..94005aacc
--- /dev/null
+++ b/libjava/javax/swing/Timer$Task.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_Timer$Task__
+#define __javax_swing_Timer$Task__
+
+#pragma interface
+
+#include <java/util/TimerTask.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class Timer;
+        class Timer$Task;
+    }
+  }
+}
+
+class javax::swing::Timer$Task : public ::java::util::TimerTask
+{
+
+  Timer$Task(::javax::swing::Timer *);
+public:
+  virtual void run();
+public: // actually package-private
+  Timer$Task(::javax::swing::Timer *, ::javax::swing::Timer$Task *);
+  ::javax::swing::Timer * __attribute__((aligned(__alignof__( ::java::util::TimerTask)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_Timer$Task__
diff --git a/libjava/javax/swing/Timer.h b/libjava/javax/swing/Timer.h
new file mode 100644
index 000000000..9768bdfb7
--- /dev/null
+++ b/libjava/javax/swing/Timer.h
@@ -0,0 +1,90 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_Timer__
+#define __javax_swing_Timer__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+          class ActionListener;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Timer;
+        class Timer$Task;
+      namespace event
+      {
+          class EventListenerList;
+      }
+    }
+  }
+}
+
+class javax::swing::Timer : public ::java::lang::Object
+{
+
+public:
+  Timer(jint, ::java::awt::event::ActionListener *);
+  virtual JArray< ::java::awt::event::ActionListener * > * getActionListeners();
+  virtual void setCoalesce(jboolean);
+  virtual jboolean isCoalesce();
+  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
+  static void setLogTimers(jboolean);
+  static jboolean getLogTimers();
+  virtual void setDelay(jint);
+  virtual jint getDelay();
+  virtual void setInitialDelay(jint);
+  virtual jint getInitialDelay();
+  virtual void setRepeats(jboolean);
+  virtual jboolean isRepeats();
+  virtual jboolean isRunning();
+  virtual void addActionListener(::java::awt::event::ActionListener *);
+  virtual void removeActionListener(::java::awt::event::ActionListener *);
+  virtual void restart();
+  virtual void start();
+  virtual void stop();
+public: // actually protected
+  virtual void fireActionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  virtual void fireActionPerformed();
+  virtual void drainEvents();
+  virtual void queueEvent();
+private:
+  static const jlong serialVersionUID = -1116180831621385484LL;
+  ::java::lang::Runnable * __attribute__((aligned(__alignof__( ::java::lang::Object)))) drainer;
+  static ::java::util::Timer * timer;
+public: // actually package-private
+  static jboolean logTimers;
+public: // actually protected
+  ::javax::swing::event::EventListenerList * listenerList;
+public: // actually package-private
+  jboolean coalesce;
+  jboolean repeats;
+  jint delay;
+  jint initialDelay;
+  jint ticks;
+  ::javax::swing::Timer$Task * task;
+private:
+  jlong queue;
+  ::java::lang::Object * queueLock;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_Timer__
diff --git a/libjava/javax/swing/ToolTipManager$insideTimerAction.h b/libjava/javax/swing/ToolTipManager$insideTimerAction.h
new file mode 100644
index 000000000..52fe573fe
--- /dev/null
+++ b/libjava/javax/swing/ToolTipManager$insideTimerAction.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_ToolTipManager$insideTimerAction__
+#define __javax_swing_ToolTipManager$insideTimerAction__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ToolTipManager;
+        class ToolTipManager$insideTimerAction;
+    }
+  }
+}
+
+class javax::swing::ToolTipManager$insideTimerAction : public ::java::lang::Object
+{
+
+public: // actually protected
+  ToolTipManager$insideTimerAction(::javax::swing::ToolTipManager *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::ToolTipManager * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_ToolTipManager$insideTimerAction__
diff --git a/libjava/javax/swing/ToolTipManager$outsideTimerAction.h b/libjava/javax/swing/ToolTipManager$outsideTimerAction.h
new file mode 100644
index 000000000..1f418783b
--- /dev/null
+++ b/libjava/javax/swing/ToolTipManager$outsideTimerAction.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_ToolTipManager$outsideTimerAction__
+#define __javax_swing_ToolTipManager$outsideTimerAction__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ToolTipManager;
+        class ToolTipManager$outsideTimerAction;
+    }
+  }
+}
+
+class javax::swing::ToolTipManager$outsideTimerAction : public ::java::lang::Object
+{
+
+public: // actually protected
+  ToolTipManager$outsideTimerAction(::javax::swing::ToolTipManager *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::ToolTipManager * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_ToolTipManager$outsideTimerAction__
diff --git a/libjava/javax/swing/ToolTipManager$stillInsideTimerAction.h b/libjava/javax/swing/ToolTipManager$stillInsideTimerAction.h
new file mode 100644
index 000000000..2e334c564
--- /dev/null
+++ b/libjava/javax/swing/ToolTipManager$stillInsideTimerAction.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_ToolTipManager$stillInsideTimerAction__
+#define __javax_swing_ToolTipManager$stillInsideTimerAction__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ToolTipManager;
+        class ToolTipManager$stillInsideTimerAction;
+    }
+  }
+}
+
+class javax::swing::ToolTipManager$stillInsideTimerAction : public ::java::lang::Object
+{
+
+public: // actually protected
+  ToolTipManager$stillInsideTimerAction(::javax::swing::ToolTipManager *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::ToolTipManager * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_ToolTipManager$stillInsideTimerAction__
diff --git a/libjava/javax/swing/ToolTipManager.h b/libjava/javax/swing/ToolTipManager.h
new file mode 100644
index 000000000..c838ac43d
--- /dev/null
+++ b/libjava/javax/swing/ToolTipManager.h
@@ -0,0 +1,92 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_ToolTipManager__
+#define __javax_swing_ToolTipManager__
+
+#pragma interface
+
+#include <java/awt/event/MouseAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Dimension;
+        class Point;
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class JToolTip;
+        class Popup;
+        class Timer;
+        class ToolTipManager;
+    }
+  }
+}
+
+class javax::swing::ToolTipManager : public ::java::awt::event::MouseAdapter
+{
+
+public: // actually package-private
+  ToolTipManager();
+public:
+  static ::javax::swing::ToolTipManager * sharedInstance();
+  virtual void setEnabled(jboolean);
+  virtual jboolean isEnabled();
+  virtual jboolean isLightWeightPopupEnabled();
+  virtual void setLightWeightPopupEnabled(jboolean);
+  virtual jint getInitialDelay();
+  virtual void setInitialDelay(jint);
+  virtual jint getDismissDelay();
+  virtual void setDismissDelay(jint);
+  virtual jint getReshowDelay();
+  virtual void setReshowDelay(jint);
+  virtual void registerComponent(::javax::swing::JComponent *);
+  virtual void unregisterComponent(::javax::swing::JComponent *);
+  virtual void mouseEntered(::java::awt::event::MouseEvent *);
+  virtual void mouseExited(::java::awt::event::MouseEvent *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+private:
+  void checkTipUpdate(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  virtual void showTip();
+private:
+  ::java::awt::Point * adjustLocation(::java::awt::Point *, ::java::awt::Component *, ::java::awt::Dimension *);
+public: // actually package-private
+  virtual void hideTip();
+private:
+  ::java::awt::Component * getContentPaneDeepestComponent(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  ::javax::swing::Timer * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) enterTimer;
+  ::javax::swing::Timer * exitTimer;
+  ::javax::swing::Timer * insideTimer;
+private:
+  jboolean enabled;
+public: // actually protected
+  jboolean lightWeightPopupEnabled;
+  jboolean heavyWeightPopupEnabled;
+private:
+  static ::javax::swing::ToolTipManager * shared;
+  ::javax::swing::JComponent * currentComponent;
+  ::javax::swing::JToolTip * currentTip;
+  ::java::lang::String * toolTipText;
+  ::java::awt::Point * currentPoint;
+  ::javax::swing::Popup * popup;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_ToolTipManager__
diff --git a/libjava/javax/swing/TransferHandler$PropertyTransferable.h b/libjava/javax/swing/TransferHandler$PropertyTransferable.h
new file mode 100644
index 000000000..662bce0ca
--- /dev/null
+++ b/libjava/javax/swing/TransferHandler$PropertyTransferable.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_TransferHandler$PropertyTransferable__
+#define __javax_swing_TransferHandler$PropertyTransferable__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace datatransfer
+      {
+          class DataFlavor;
+      }
+    }
+    namespace beans
+    {
+        class PropertyDescriptor;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class TransferHandler$PropertyTransferable;
+    }
+  }
+}
+
+class javax::swing::TransferHandler$PropertyTransferable : public ::java::lang::Object
+{
+
+public: // actually package-private
+  TransferHandler$PropertyTransferable(::javax::swing::JComponent *, ::java::beans::PropertyDescriptor *);
+public:
+  virtual JArray< ::java::awt::datatransfer::DataFlavor * > * getTransferDataFlavors();
+  virtual jboolean isDataFlavorSupported(::java::awt::datatransfer::DataFlavor *);
+  virtual ::java::lang::Object * getTransferData(::java::awt::datatransfer::DataFlavor *);
+private:
+  ::javax::swing::JComponent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) component;
+  ::java::beans::PropertyDescriptor * property;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_TransferHandler$PropertyTransferable__
diff --git a/libjava/javax/swing/TransferHandler$SwingDragGestureRecognizer.h b/libjava/javax/swing/TransferHandler$SwingDragGestureRecognizer.h
new file mode 100644
index 000000000..03c7f18e8
--- /dev/null
+++ b/libjava/javax/swing/TransferHandler$SwingDragGestureRecognizer.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_TransferHandler$SwingDragGestureRecognizer__
+#define __javax_swing_TransferHandler$SwingDragGestureRecognizer__
+
+#pragma interface
+
+#include <java/awt/dnd/DragGestureRecognizer.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace dnd
+      {
+          class DragGestureListener;
+      }
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class TransferHandler$SwingDragGestureRecognizer;
+    }
+  }
+}
+
+class javax::swing::TransferHandler$SwingDragGestureRecognizer : public ::java::awt::dnd::DragGestureRecognizer
+{
+
+public: // actually protected
+  TransferHandler$SwingDragGestureRecognizer(::java::awt::dnd::DragGestureListener *);
+public: // actually package-private
+  virtual void gesture(::javax::swing::JComponent *, ::java::awt::event::MouseEvent *, jint, jint);
+public: // actually protected
+  virtual void registerListeners();
+  virtual void unregisterListeners();
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_TransferHandler$SwingDragGestureRecognizer__
diff --git a/libjava/javax/swing/TransferHandler$SwingDragHandler.h b/libjava/javax/swing/TransferHandler$SwingDragHandler.h
new file mode 100644
index 000000000..7b7631ca9
--- /dev/null
+++ b/libjava/javax/swing/TransferHandler$SwingDragHandler.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_TransferHandler$SwingDragHandler__
+#define __javax_swing_TransferHandler$SwingDragHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace dnd
+      {
+          class DragGestureEvent;
+          class DragSourceDragEvent;
+          class DragSourceDropEvent;
+          class DragSourceEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class TransferHandler$SwingDragHandler;
+    }
+  }
+}
+
+class javax::swing::TransferHandler$SwingDragHandler : public ::java::lang::Object
+{
+
+  TransferHandler$SwingDragHandler();
+public:
+  virtual void dragGestureRecognized(::java::awt::dnd::DragGestureEvent *);
+  virtual void dragDropEnd(::java::awt::dnd::DragSourceDropEvent *);
+  virtual void dragEnter(::java::awt::dnd::DragSourceDragEvent *);
+  virtual void dragExit(::java::awt::dnd::DragSourceEvent *);
+  virtual void dragOver(::java::awt::dnd::DragSourceDragEvent *);
+  virtual void dropActionChanged(::java::awt::dnd::DragSourceDragEvent *);
+public: // actually package-private
+  TransferHandler$SwingDragHandler(::javax::swing::TransferHandler$SwingDragHandler *);
+private:
+  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) autoscrolls;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_TransferHandler$SwingDragHandler__
diff --git a/libjava/javax/swing/TransferHandler$TransferAction.h b/libjava/javax/swing/TransferHandler$TransferAction.h
new file mode 100644
index 000000000..f11d87968
--- /dev/null
+++ b/libjava/javax/swing/TransferHandler$TransferAction.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_TransferHandler$TransferAction__
+#define __javax_swing_TransferHandler$TransferAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace datatransfer
+      {
+          class Clipboard;
+      }
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class TransferHandler$TransferAction;
+    }
+  }
+}
+
+class javax::swing::TransferHandler$TransferAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  TransferHandler$TransferAction(::java::lang::String *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+private:
+  static ::java::awt::datatransfer::Clipboard * getClipboard(::javax::swing::JComponent *);
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) command;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_TransferHandler$TransferAction__
diff --git a/libjava/javax/swing/TransferHandler.h b/libjava/javax/swing/TransferHandler.h
new file mode 100644
index 000000000..f7ae80492
--- /dev/null
+++ b/libjava/javax/swing/TransferHandler.h
@@ -0,0 +1,94 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_TransferHandler__
+#define __javax_swing_TransferHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace datatransfer
+      {
+          class Clipboard;
+          class DataFlavor;
+          class Transferable;
+      }
+      namespace event
+      {
+          class InputEvent;
+      }
+    }
+    namespace beans
+    {
+        class PropertyDescriptor;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Action;
+        class Icon;
+        class JComponent;
+        class TransferHandler;
+        class TransferHandler$SwingDragGestureRecognizer;
+    }
+  }
+}
+
+class javax::swing::TransferHandler : public ::java::lang::Object
+{
+
+public:
+  static ::javax::swing::Action * getCopyAction();
+  static ::javax::swing::Action * getCutAction();
+  static ::javax::swing::Action * getPasteAction();
+public: // actually protected
+  TransferHandler();
+public:
+  TransferHandler(::java::lang::String *);
+  virtual jboolean canImport(::javax::swing::JComponent *, JArray< ::java::awt::datatransfer::DataFlavor * > *);
+public: // actually protected
+  virtual ::java::awt::datatransfer::Transferable * createTransferable(::javax::swing::JComponent *);
+public:
+  virtual void exportAsDrag(::javax::swing::JComponent *, ::java::awt::event::InputEvent *, jint);
+public: // actually protected
+  virtual void exportDone(::javax::swing::JComponent *, ::java::awt::datatransfer::Transferable *, jint);
+public:
+  virtual void exportToClipboard(::javax::swing::JComponent *, ::java::awt::datatransfer::Clipboard *, jint);
+  virtual jint getSourceActions(::javax::swing::JComponent *);
+  virtual ::javax::swing::Icon * getVisualRepresentation(::java::awt::datatransfer::Transferable *);
+  virtual jboolean importData(::javax::swing::JComponent *, ::java::awt::datatransfer::Transferable *);
+private:
+  ::java::beans::PropertyDescriptor * getPropertyDescriptor(::javax::swing::JComponent *);
+  ::java::awt::datatransfer::DataFlavor * getPropertyDataFlavor(::java::lang::Class *, JArray< ::java::awt::datatransfer::DataFlavor * > *);
+  static const jlong serialVersionUID = -967749805571669910LL;
+  static ::java::lang::String * COMMAND_COPY;
+  static ::java::lang::String * COMMAND_CUT;
+  static ::java::lang::String * COMMAND_PASTE;
+public:
+  static const jint NONE = 0;
+  static const jint COPY = 1;
+  static const jint MOVE = 2;
+  static const jint COPY_OR_MOVE = 3;
+private:
+  static ::javax::swing::Action * copyAction;
+  static ::javax::swing::Action * cutAction;
+  static ::javax::swing::Action * pasteAction;
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) sourceActions;
+  ::javax::swing::Icon * visualRepresentation;
+  ::java::lang::String * propertyName;
+  ::javax::swing::TransferHandler$SwingDragGestureRecognizer * recognizer;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_TransferHandler__
diff --git a/libjava/javax/swing/UIDefaults$1.h b/libjava/javax/swing/UIDefaults$1.h
new file mode 100644
index 000000000..71fd942b6
--- /dev/null
+++ b/libjava/javax/swing/UIDefaults$1.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_UIDefaults$1__
+#define __javax_swing_UIDefaults$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class UIDefaults;
+        class UIDefaults$1;
+        class UIDefaults$ProxyLazyValue;
+    }
+  }
+}
+
+class javax::swing::UIDefaults$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  UIDefaults$1(::javax::swing::UIDefaults$ProxyLazyValue *, ::java::lang::String *);
+public:
+  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
+public: // actually package-private
+  ::javax::swing::UIDefaults$ProxyLazyValue * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
+private:
+  ::java::lang::String * val$className;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_UIDefaults$1__
diff --git a/libjava/javax/swing/UIDefaults$2.h b/libjava/javax/swing/UIDefaults$2.h
new file mode 100644
index 000000000..4218f7a0e
--- /dev/null
+++ b/libjava/javax/swing/UIDefaults$2.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_UIDefaults$2__
+#define __javax_swing_UIDefaults$2__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class UIDefaults;
+        class UIDefaults$2;
+        class UIDefaults$ProxyLazyValue;
+    }
+  }
+}
+
+class javax::swing::UIDefaults$2 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  UIDefaults$2(::javax::swing::UIDefaults$ProxyLazyValue *, ::java::lang::String *, ::java::lang::String *);
+public:
+  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
+public: // actually package-private
+  ::javax::swing::UIDefaults$ProxyLazyValue * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
+private:
+  ::java::lang::String * val$className;
+  ::java::lang::String * val$methodName;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_UIDefaults$2__
diff --git a/libjava/javax/swing/UIDefaults$3.h b/libjava/javax/swing/UIDefaults$3.h
new file mode 100644
index 000000000..55ba83032
--- /dev/null
+++ b/libjava/javax/swing/UIDefaults$3.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_UIDefaults$3__
+#define __javax_swing_UIDefaults$3__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class UIDefaults;
+        class UIDefaults$3;
+        class UIDefaults$ProxyLazyValue;
+    }
+  }
+}
+
+class javax::swing::UIDefaults$3 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  UIDefaults$3(::javax::swing::UIDefaults$ProxyLazyValue *, ::java::lang::String *, JArray< ::java::lang::Class * > *, JArray< ::java::lang::Object * > *);
+public:
+  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
+public: // actually package-private
+  ::javax::swing::UIDefaults$ProxyLazyValue * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
+private:
+  ::java::lang::String * val$className;
+  JArray< ::java::lang::Class * > * val$clss;
+  JArray< ::java::lang::Object * > * val$objs;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_UIDefaults$3__
diff --git a/libjava/javax/swing/UIDefaults$4.h b/libjava/javax/swing/UIDefaults$4.h
new file mode 100644
index 000000000..8f0ee7486
--- /dev/null
+++ b/libjava/javax/swing/UIDefaults$4.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_UIDefaults$4__
+#define __javax_swing_UIDefaults$4__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class UIDefaults;
+        class UIDefaults$4;
+        class UIDefaults$ProxyLazyValue;
+    }
+  }
+}
+
+class javax::swing::UIDefaults$4 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  UIDefaults$4(::javax::swing::UIDefaults$ProxyLazyValue *, ::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::Class * > *, JArray< ::java::lang::Object * > *);
+public:
+  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
+public: // actually package-private
+  ::javax::swing::UIDefaults$ProxyLazyValue * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
+private:
+  ::java::lang::String * val$className;
+  ::java::lang::String * val$methodName;
+  JArray< ::java::lang::Class * > * val$clss;
+  JArray< ::java::lang::Object * > * val$objs;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_UIDefaults$4__
diff --git a/libjava/javax/swing/UIDefaults$ActiveValue.h b/libjava/javax/swing/UIDefaults$ActiveValue.h
new file mode 100644
index 000000000..37d1b4034
--- /dev/null
+++ b/libjava/javax/swing/UIDefaults$ActiveValue.h
@@ -0,0 +1,30 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_UIDefaults$ActiveValue__
+#define __javax_swing_UIDefaults$ActiveValue__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class UIDefaults;
+        class UIDefaults$ActiveValue;
+    }
+  }
+}
+
+class javax::swing::UIDefaults$ActiveValue : public ::java::lang::Object
+{
+
+public:
+  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_UIDefaults$ActiveValue__
diff --git a/libjava/javax/swing/UIDefaults$LazyInputMap.h b/libjava/javax/swing/UIDefaults$LazyInputMap.h
new file mode 100644
index 000000000..1072c0030
--- /dev/null
+++ b/libjava/javax/swing/UIDefaults$LazyInputMap.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_UIDefaults$LazyInputMap__
+#define __javax_swing_UIDefaults$LazyInputMap__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class UIDefaults;
+        class UIDefaults$LazyInputMap;
+    }
+  }
+}
+
+class javax::swing::UIDefaults$LazyInputMap : public ::java::lang::Object
+{
+
+public:
+  UIDefaults$LazyInputMap(JArray< ::java::lang::Object * > *);
+  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
+public: // actually package-private
+  JArray< ::java::lang::Object * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) bind;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_UIDefaults$LazyInputMap__
diff --git a/libjava/javax/swing/UIDefaults$LazyValue.h b/libjava/javax/swing/UIDefaults$LazyValue.h
new file mode 100644
index 000000000..bd451e45b
--- /dev/null
+++ b/libjava/javax/swing/UIDefaults$LazyValue.h
@@ -0,0 +1,30 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_UIDefaults$LazyValue__
+#define __javax_swing_UIDefaults$LazyValue__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class UIDefaults;
+        class UIDefaults$LazyValue;
+    }
+  }
+}
+
+class javax::swing::UIDefaults$LazyValue : public ::java::lang::Object
+{
+
+public:
+  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_UIDefaults$LazyValue__
diff --git a/libjava/javax/swing/UIDefaults$ProxyLazyValue.h b/libjava/javax/swing/UIDefaults$ProxyLazyValue.h
new file mode 100644
index 000000000..ea6632c18
--- /dev/null
+++ b/libjava/javax/swing/UIDefaults$ProxyLazyValue.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_UIDefaults$ProxyLazyValue__
+#define __javax_swing_UIDefaults$ProxyLazyValue__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class UIDefaults;
+        class UIDefaults$LazyValue;
+        class UIDefaults$ProxyLazyValue;
+    }
+  }
+}
+
+class javax::swing::UIDefaults$ProxyLazyValue : public ::java::lang::Object
+{
+
+public:
+  UIDefaults$ProxyLazyValue(::java::lang::String *);
+  UIDefaults$ProxyLazyValue(::java::lang::String *, ::java::lang::String *);
+  UIDefaults$ProxyLazyValue(::java::lang::String *, JArray< ::java::lang::Object * > *);
+  UIDefaults$ProxyLazyValue(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::Object * > *);
+  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
+public: // actually package-private
+  ::javax::swing::UIDefaults$LazyValue * __attribute__((aligned(__alignof__( ::java::lang::Object)))) inner;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_UIDefaults$ProxyLazyValue__
diff --git a/libjava/javax/swing/UIDefaults.h b/libjava/javax/swing/UIDefaults.h
new file mode 100644
index 000000000..2daecceee
--- /dev/null
+++ b/libjava/javax/swing/UIDefaults.h
@@ -0,0 +1,104 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_UIDefaults__
+#define __javax_swing_UIDefaults__
+
+#pragma interface
+
+#include <java/util/Hashtable.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Dimension;
+        class Font;
+        class Insets;
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+        class PropertyChangeSupport;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+        class JComponent;
+        class UIDefaults;
+      namespace border
+      {
+          class Border;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+      }
+    }
+  }
+}
+
+class javax::swing::UIDefaults : public ::java::util::Hashtable
+{
+
+public:
+  UIDefaults();
+  UIDefaults(JArray< ::java::lang::Object * > *);
+  virtual ::java::lang::Object * get(::java::lang::Object *);
+  virtual ::java::lang::Object * get(::java::lang::Object *, ::java::util::Locale *);
+  virtual ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *);
+  virtual void putDefaults(JArray< ::java::lang::Object * > *);
+private:
+  ::java::lang::Object * checkAndPut(::java::lang::Object *, ::java::lang::Object *);
+public:
+  virtual ::java::awt::Font * getFont(::java::lang::Object *);
+  virtual ::java::awt::Font * getFont(::java::lang::Object *, ::java::util::Locale *);
+  virtual ::java::awt::Color * getColor(::java::lang::Object *);
+  virtual ::java::awt::Color * getColor(::java::lang::Object *, ::java::util::Locale *);
+  virtual ::javax::swing::Icon * getIcon(::java::lang::Object *);
+  virtual ::javax::swing::Icon * getIcon(::java::lang::Object *, ::java::util::Locale *);
+  virtual ::javax::swing::border::Border * getBorder(::java::lang::Object *);
+  virtual ::javax::swing::border::Border * getBorder(::java::lang::Object *, ::java::util::Locale *);
+  virtual ::java::lang::String * getString(::java::lang::Object *);
+  virtual ::java::lang::String * getString(::java::lang::Object *, ::java::util::Locale *);
+  virtual jint getInt(::java::lang::Object *);
+  virtual jint getInt(::java::lang::Object *, ::java::util::Locale *);
+  virtual jboolean getBoolean(::java::lang::Object *);
+  virtual jboolean getBoolean(::java::lang::Object *, ::java::util::Locale *);
+  virtual ::java::awt::Insets * getInsets(::java::lang::Object *);
+  virtual ::java::awt::Insets * getInsets(::java::lang::Object *, ::java::util::Locale *);
+  virtual ::java::awt::Dimension * getDimension(::java::lang::Object *);
+  virtual ::java::awt::Dimension * getDimension(::java::lang::Object *, ::java::util::Locale *);
+  virtual ::java::lang::Class * getUIClass(::java::lang::String *, ::java::lang::ClassLoader *);
+  virtual ::java::lang::Class * getUIClass(::java::lang::String *);
+public: // actually protected
+  virtual void getUIError(::java::lang::String *);
+public:
+  virtual ::javax::swing::plaf::ComponentUI * getUI(::javax::swing::JComponent *);
+  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
+  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
+  virtual JArray< ::java::beans::PropertyChangeListener * > * getPropertyChangeListeners();
+public: // actually protected
+  virtual void firePropertyChange(::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *);
+public:
+  virtual void addResourceBundle(::java::lang::String *);
+  virtual void removeResourceBundle(::java::lang::String *);
+  virtual void setDefaultLocale(::java::util::Locale *);
+  virtual ::java::util::Locale * getDefaultLocale();
+private:
+  ::java::util::LinkedList * __attribute__((aligned(__alignof__( ::java::util::Hashtable)))) bundles;
+  ::java::util::Locale * defaultLocale;
+  ::java::beans::PropertyChangeSupport * propertyChangeSupport;
+  static const jlong serialVersionUID = 7341222528856548117LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_UIDefaults__
diff --git a/libjava/javax/swing/UIManager$LookAndFeelInfo.h b/libjava/javax/swing/UIManager$LookAndFeelInfo.h
new file mode 100644
index 000000000..581d76bee
--- /dev/null
+++ b/libjava/javax/swing/UIManager$LookAndFeelInfo.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_UIManager$LookAndFeelInfo__
+#define __javax_swing_UIManager$LookAndFeelInfo__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class UIManager$LookAndFeelInfo;
+    }
+  }
+}
+
+class javax::swing::UIManager$LookAndFeelInfo : public ::java::lang::Object
+{
+
+public:
+  UIManager$LookAndFeelInfo(::java::lang::String *, ::java::lang::String *);
+  virtual ::java::lang::String * getName();
+  virtual ::java::lang::String * getClassName();
+  virtual ::java::lang::String * toString();
+public: // actually package-private
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
+  ::java::lang::String * clazz;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_UIManager$LookAndFeelInfo__
diff --git a/libjava/javax/swing/UIManager$MultiplexUIDefaults$MultiplexEnumeration.h b/libjava/javax/swing/UIManager$MultiplexUIDefaults$MultiplexEnumeration.h
new file mode 100644
index 000000000..a256eaf3e
--- /dev/null
+++ b/libjava/javax/swing/UIManager$MultiplexUIDefaults$MultiplexEnumeration.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_UIManager$MultiplexUIDefaults$MultiplexEnumeration__
+#define __javax_swing_UIManager$MultiplexUIDefaults$MultiplexEnumeration__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class UIManager$MultiplexUIDefaults;
+        class UIManager$MultiplexUIDefaults$MultiplexEnumeration;
+    }
+  }
+}
+
+class javax::swing::UIManager$MultiplexUIDefaults$MultiplexEnumeration : public ::java::lang::Object
+{
+
+public: // actually package-private
+  UIManager$MultiplexUIDefaults$MultiplexEnumeration(::javax::swing::UIManager$MultiplexUIDefaults *, ::java::util::Enumeration *, ::java::util::Enumeration *);
+public:
+  virtual jboolean hasMoreElements();
+  virtual ::java::lang::Object * nextElement();
+public: // actually package-private
+  JArray< ::java::util::Enumeration * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) enums;
+  jint i;
+  ::javax::swing::UIManager$MultiplexUIDefaults * this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_UIManager$MultiplexUIDefaults$MultiplexEnumeration__
diff --git a/libjava/javax/swing/UIManager$MultiplexUIDefaults.h b/libjava/javax/swing/UIManager$MultiplexUIDefaults.h
new file mode 100644
index 000000000..16a03c60d
--- /dev/null
+++ b/libjava/javax/swing/UIManager$MultiplexUIDefaults.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_UIManager$MultiplexUIDefaults__
+#define __javax_swing_UIManager$MultiplexUIDefaults__
+
+#pragma interface
+
+#include <javax/swing/UIDefaults.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class UIDefaults;
+        class UIManager$MultiplexUIDefaults;
+    }
+  }
+}
+
+class javax::swing::UIManager$MultiplexUIDefaults : public ::javax::swing::UIDefaults
+{
+
+public: // actually package-private
+  UIManager$MultiplexUIDefaults(::javax::swing::UIDefaults *);
+public:
+  virtual ::java::lang::Object * get(::java::lang::Object *);
+  virtual ::java::lang::Object * get(::java::lang::Object *, ::java::util::Locale *);
+  virtual ::java::lang::Object * remove(::java::lang::Object *);
+  virtual jint size();
+  virtual ::java::util::Enumeration * keys();
+  virtual ::java::util::Enumeration * elements();
+public: // actually package-private
+  ::javax::swing::UIDefaults * __attribute__((aligned(__alignof__( ::javax::swing::UIDefaults)))) fallback;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_UIManager$MultiplexUIDefaults__
diff --git a/libjava/javax/swing/UIManager.h b/libjava/javax/swing/UIManager.h
new file mode 100644
index 000000000..c2cdf16cf
--- /dev/null
+++ b/libjava/javax/swing/UIManager.h
@@ -0,0 +1,109 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_UIManager__
+#define __javax_swing_UIManager__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Dimension;
+        class Font;
+        class Insets;
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+        class PropertyChangeSupport;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+        class JComponent;
+        class LookAndFeel;
+        class UIDefaults;
+        class UIManager;
+        class UIManager$LookAndFeelInfo;
+        class UIManager$MultiplexUIDefaults;
+      namespace border
+      {
+          class Border;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+      }
+    }
+  }
+}
+
+class javax::swing::UIManager : public ::java::lang::Object
+{
+
+public:
+  UIManager();
+  static void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
+  static void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
+  static JArray< ::java::beans::PropertyChangeListener * > * getPropertyChangeListeners();
+  static void addAuxiliaryLookAndFeel(::javax::swing::LookAndFeel *);
+  static jboolean removeAuxiliaryLookAndFeel(::javax::swing::LookAndFeel *);
+  static JArray< ::javax::swing::LookAndFeel * > * getAuxiliaryLookAndFeels();
+  static ::java::lang::Object * get(::java::lang::Object *);
+  static ::java::lang::Object * get(::java::lang::Object *, ::java::util::Locale *);
+  static jboolean getBoolean(::java::lang::Object *);
+  static jboolean getBoolean(::java::lang::Object *, ::java::util::Locale *);
+  static ::javax::swing::border::Border * getBorder(::java::lang::Object *);
+  static ::javax::swing::border::Border * getBorder(::java::lang::Object *, ::java::util::Locale *);
+  static ::java::awt::Color * getColor(::java::lang::Object *);
+  static ::java::awt::Color * getColor(::java::lang::Object *, ::java::util::Locale *);
+  static ::java::lang::String * getCrossPlatformLookAndFeelClassName();
+  static ::javax::swing::UIDefaults * getDefaults();
+  static ::java::awt::Dimension * getDimension(::java::lang::Object *);
+  static ::java::awt::Dimension * getDimension(::java::lang::Object *, ::java::util::Locale *);
+  static ::java::awt::Font * getFont(::java::lang::Object *);
+  static ::java::awt::Font * getFont(::java::lang::Object *, ::java::util::Locale *);
+  static ::javax::swing::Icon * getIcon(::java::lang::Object *);
+  static ::javax::swing::Icon * getIcon(::java::lang::Object *, ::java::util::Locale *);
+  static ::java::awt::Insets * getInsets(::java::lang::Object *);
+  static ::java::awt::Insets * getInsets(::java::lang::Object *, ::java::util::Locale *);
+  static JArray< ::javax::swing::UIManager$LookAndFeelInfo * > * getInstalledLookAndFeels();
+  static jint getInt(::java::lang::Object *);
+  static jint getInt(::java::lang::Object *, ::java::util::Locale *);
+  static ::javax::swing::LookAndFeel * getLookAndFeel();
+  static ::javax::swing::UIDefaults * getLookAndFeelDefaults();
+  static ::java::lang::String * getString(::java::lang::Object *);
+  static ::java::lang::String * getString(::java::lang::Object *, ::java::util::Locale *);
+  static ::java::lang::String * getSystemLookAndFeelClassName();
+  static ::javax::swing::plaf::ComponentUI * getUI(::javax::swing::JComponent *);
+  static void installLookAndFeel(::java::lang::String *, ::java::lang::String *);
+  static void installLookAndFeel(::javax::swing::UIManager$LookAndFeelInfo *);
+  static ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *);
+  static void setInstalledLookAndFeels(JArray< ::javax::swing::UIManager$LookAndFeelInfo * > *);
+  static void setLookAndFeel(::javax::swing::LookAndFeel *);
+  static void setLookAndFeel(::java::lang::String *);
+private:
+  static const jlong serialVersionUID = -5547433830339189365LL;
+public: // actually package-private
+  static JArray< ::javax::swing::UIManager$LookAndFeelInfo * > * installed;
+  static JArray< ::javax::swing::LookAndFeel * > * auxLookAndFeels;
+  static ::javax::swing::LookAndFeel * currentLookAndFeel;
+  static ::javax::swing::UIManager$MultiplexUIDefaults * currentUIDefaults;
+  static ::javax::swing::UIDefaults * lookAndFeelDefaults;
+  static ::java::beans::PropertyChangeSupport * listeners;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_UIManager__
diff --git a/libjava/javax/swing/UnsupportedLookAndFeelException.h b/libjava/javax/swing/UnsupportedLookAndFeelException.h
new file mode 100644
index 000000000..bf5e35c15
--- /dev/null
+++ b/libjava/javax/swing/UnsupportedLookAndFeelException.h
@@ -0,0 +1,29 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_UnsupportedLookAndFeelException__
+#define __javax_swing_UnsupportedLookAndFeelException__
+
+#pragma interface
+
+#include <java/lang/Exception.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class UnsupportedLookAndFeelException;
+    }
+  }
+}
+
+class javax::swing::UnsupportedLookAndFeelException : public ::java::lang::Exception
+{
+
+public:
+  UnsupportedLookAndFeelException(::java::lang::String *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_UnsupportedLookAndFeelException__
diff --git a/libjava/javax/swing/ViewportLayout.h b/libjava/javax/swing/ViewportLayout.h
new file mode 100644
index 000000000..9dadb49ea
--- /dev/null
+++ b/libjava/javax/swing/ViewportLayout.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_ViewportLayout__
+#define __javax_swing_ViewportLayout__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ViewportLayout;
+    }
+  }
+}
+
+class javax::swing::ViewportLayout : public ::java::lang::Object
+{
+
+public:
+  ViewportLayout();
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+  virtual void removeLayoutComponent(::java::awt::Component *);
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual void layoutContainer(::java::awt::Container *);
+private:
+  static const jlong serialVersionUID = -788225906076097229LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_ViewportLayout__
diff --git a/libjava/javax/swing/WindowConstants.h b/libjava/javax/swing/WindowConstants.h
new file mode 100644
index 000000000..8cad3c268
--- /dev/null
+++ b/libjava/javax/swing/WindowConstants.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_WindowConstants__
+#define __javax_swing_WindowConstants__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class WindowConstants;
+    }
+  }
+}
+
+class javax::swing::WindowConstants : public ::java::lang::Object
+{
+
+public:
+  static const jint DO_NOTHING_ON_CLOSE = 0;
+  static const jint HIDE_ON_CLOSE = 1;
+  static const jint DISPOSE_ON_CLOSE = 2;
+  static const jint EXIT_ON_CLOSE = 3;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_WindowConstants__
diff --git a/libjava/javax/swing/border/AbstractBorder.h b/libjava/javax/swing/border/AbstractBorder.h
new file mode 100644
index 000000000..e91b5e98e
--- /dev/null
+++ b/libjava/javax/swing/border/AbstractBorder.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_border_AbstractBorder__
+#define __javax_swing_border_AbstractBorder__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace border
+      {
+          class AbstractBorder;
+          class Border;
+      }
+    }
+  }
+}
+
+class javax::swing::border::AbstractBorder : public ::java::lang::Object
+{
+
+public:
+  AbstractBorder();
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+  virtual jboolean isBorderOpaque();
+  virtual ::java::awt::Rectangle * getInteriorRectangle(::java::awt::Component *, jint, jint, jint, jint);
+  static ::java::awt::Rectangle * getInteriorRectangle(::java::awt::Component *, ::javax::swing::border::Border *, jint, jint, jint, jint);
+public: // actually package-private
+  static const jlong serialVersionUID = -545885975315191844LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_border_AbstractBorder__
diff --git a/libjava/javax/swing/border/BevelBorder.h b/libjava/javax/swing/border/BevelBorder.h
new file mode 100644
index 000000000..369c1c57d
--- /dev/null
+++ b/libjava/javax/swing/border/BevelBorder.h
@@ -0,0 +1,74 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_border_BevelBorder__
+#define __javax_swing_border_BevelBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace border
+      {
+          class BevelBorder;
+      }
+    }
+  }
+}
+
+class javax::swing::border::BevelBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  BevelBorder(jint);
+  BevelBorder(jint, ::java::awt::Color *, ::java::awt::Color *);
+  BevelBorder(jint, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+  virtual ::java::awt::Color * getHighlightOuterColor(::java::awt::Component *);
+  virtual ::java::awt::Color * getHighlightInnerColor(::java::awt::Component *);
+  virtual ::java::awt::Color * getShadowInnerColor(::java::awt::Component *);
+  virtual ::java::awt::Color * getShadowOuterColor(::java::awt::Component *);
+  virtual ::java::awt::Color * getHighlightOuterColor();
+  virtual ::java::awt::Color * getHighlightInnerColor();
+  virtual ::java::awt::Color * getShadowInnerColor();
+  virtual ::java::awt::Color * getShadowOuterColor();
+  virtual jint getBevelType();
+  virtual jboolean isBorderOpaque();
+public: // actually protected
+  virtual void paintRaisedBevel(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintLoweredBevel(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+private:
+  static void paintBevel(::java::awt::Graphics *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
+public: // actually package-private
+  static const jlong serialVersionUID = -1034942243356299676LL;
+public:
+  static const jint RAISED = 0;
+  static const jint LOWERED = 1;
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) bevelType;
+  ::java::awt::Color * highlightOuter;
+  ::java::awt::Color * highlightInner;
+  ::java::awt::Color * shadowOuter;
+  ::java::awt::Color * shadowInner;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_border_BevelBorder__
diff --git a/libjava/javax/swing/border/Border.h b/libjava/javax/swing/border/Border.h
new file mode 100644
index 000000000..7fe11ee46
--- /dev/null
+++ b/libjava/javax/swing/border/Border.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_border_Border__
+#define __javax_swing_border_Border__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace border
+      {
+          class Border;
+      }
+    }
+  }
+}
+
+class javax::swing::border::Border : public ::java::lang::Object
+{
+
+public:
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint) = 0;
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *) = 0;
+  virtual jboolean isBorderOpaque() = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_border_Border__
diff --git a/libjava/javax/swing/border/CompoundBorder.h b/libjava/javax/swing/border/CompoundBorder.h
new file mode 100644
index 000000000..703398a73
--- /dev/null
+++ b/libjava/javax/swing/border/CompoundBorder.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_border_CompoundBorder__
+#define __javax_swing_border_CompoundBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace border
+      {
+          class Border;
+          class CompoundBorder;
+      }
+    }
+  }
+}
+
+class javax::swing::border::CompoundBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  CompoundBorder();
+  CompoundBorder(::javax::swing::border::Border *, ::javax::swing::border::Border *);
+  virtual jboolean isBorderOpaque();
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::javax::swing::border::Border * getOutsideBorder();
+  virtual ::javax::swing::border::Border * getInsideBorder();
+public: // actually package-private
+  static const jlong serialVersionUID = 9054540377030555103LL;
+public: // actually protected
+  ::javax::swing::border::Border * __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) insideBorder;
+  ::javax::swing::border::Border * outsideBorder;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_border_CompoundBorder__
diff --git a/libjava/javax/swing/border/EmptyBorder.h b/libjava/javax/swing/border/EmptyBorder.h
new file mode 100644
index 000000000..8658371ad
--- /dev/null
+++ b/libjava/javax/swing/border/EmptyBorder.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_border_EmptyBorder__
+#define __javax_swing_border_EmptyBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace border
+      {
+          class EmptyBorder;
+      }
+    }
+  }
+}
+
+class javax::swing::border::EmptyBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  EmptyBorder(jint, jint, jint, jint);
+  EmptyBorder(::java::awt::Insets *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+  virtual ::java::awt::Insets * getBorderInsets();
+  virtual jboolean isBorderOpaque();
+public: // actually package-private
+  static const jlong serialVersionUID = -8116076291731988694LL;
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) left;
+  jint right;
+  jint top;
+  jint bottom;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_border_EmptyBorder__
diff --git a/libjava/javax/swing/border/EtchedBorder.h b/libjava/javax/swing/border/EtchedBorder.h
new file mode 100644
index 000000000..f760547eb
--- /dev/null
+++ b/libjava/javax/swing/border/EtchedBorder.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_border_EtchedBorder__
+#define __javax_swing_border_EtchedBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace border
+      {
+          class EtchedBorder;
+      }
+    }
+  }
+}
+
+class javax::swing::border::EtchedBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  EtchedBorder();
+  EtchedBorder(jint);
+  EtchedBorder(::java::awt::Color *, ::java::awt::Color *);
+  EtchedBorder(jint, ::java::awt::Color *, ::java::awt::Color *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+  virtual jboolean isBorderOpaque();
+  virtual jint getEtchType();
+  virtual ::java::awt::Color * getHighlightColor(::java::awt::Component *);
+  virtual ::java::awt::Color * getHighlightColor();
+  virtual ::java::awt::Color * getShadowColor(::java::awt::Component *);
+  virtual ::java::awt::Color * getShadowColor();
+private:
+  static void paintEtchedBorder(::java::awt::Graphics *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::Color *);
+public: // actually package-private
+  static const jlong serialVersionUID = 4001244046866360638LL;
+public:
+  static const jint RAISED = 0;
+  static const jint LOWERED = 1;
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) etchType;
+  ::java::awt::Color * highlight;
+  ::java::awt::Color * shadow;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_border_EtchedBorder__
diff --git a/libjava/javax/swing/border/LineBorder.h b/libjava/javax/swing/border/LineBorder.h
new file mode 100644
index 000000000..dd8d05dc5
--- /dev/null
+++ b/libjava/javax/swing/border/LineBorder.h
@@ -0,0 +1,64 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_border_LineBorder__
+#define __javax_swing_border_LineBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace border
+      {
+          class Border;
+          class LineBorder;
+      }
+    }
+  }
+}
+
+class javax::swing::border::LineBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  LineBorder(::java::awt::Color *);
+  LineBorder(::java::awt::Color *, jint);
+  LineBorder(::java::awt::Color *, jint, jboolean);
+  static ::javax::swing::border::Border * createBlackLineBorder();
+  static ::javax::swing::border::Border * createGrayLineBorder();
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+  virtual ::java::awt::Color * getLineColor();
+  virtual jint getThickness();
+  virtual jboolean getRoundedCorners();
+  virtual jboolean isBorderOpaque();
+public: // actually package-private
+  static const jlong serialVersionUID = -787563427772288970LL;
+private:
+  static ::javax::swing::border::LineBorder * blackLineBorder;
+  static ::javax::swing::border::LineBorder * grayLineBorder;
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) thickness;
+  ::java::awt::Color * lineColor;
+  jboolean roundedCorners;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_border_LineBorder__
diff --git a/libjava/javax/swing/border/MatteBorder.h b/libjava/javax/swing/border/MatteBorder.h
new file mode 100644
index 000000000..76dc3d981
--- /dev/null
+++ b/libjava/javax/swing/border/MatteBorder.h
@@ -0,0 +1,62 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_border_MatteBorder__
+#define __javax_swing_border_MatteBorder__
+
+#pragma interface
+
+#include <javax/swing/border/EmptyBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+      namespace border
+      {
+          class MatteBorder;
+      }
+    }
+  }
+}
+
+class javax::swing::border::MatteBorder : public ::javax::swing::border::EmptyBorder
+{
+
+public:
+  MatteBorder(jint, jint, jint, jint, ::java::awt::Color *);
+  MatteBorder(::java::awt::Insets *, ::java::awt::Color *);
+  MatteBorder(jint, jint, jint, jint, ::javax::swing::Icon *);
+  MatteBorder(::java::awt::Insets *, ::javax::swing::Icon *);
+  MatteBorder(::javax::swing::Icon *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+  virtual ::java::awt::Insets * getBorderInsets();
+  virtual ::java::awt::Color * getMatteColor();
+  virtual ::javax::swing::Icon * getTileIcon();
+  virtual jboolean isBorderOpaque();
+private:
+  void paintEdge(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint, jint, jint);
+public: // actually package-private
+  static const jlong serialVersionUID = 4422248989617298224LL;
+public: // actually protected
+  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::border::EmptyBorder)))) color;
+  ::javax::swing::Icon * tileIcon;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_border_MatteBorder__
diff --git a/libjava/javax/swing/border/SoftBevelBorder.h b/libjava/javax/swing/border/SoftBevelBorder.h
new file mode 100644
index 000000000..fa8ff5e6f
--- /dev/null
+++ b/libjava/javax/swing/border/SoftBevelBorder.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_border_SoftBevelBorder__
+#define __javax_swing_border_SoftBevelBorder__
+
+#pragma interface
+
+#include <javax/swing/border/BevelBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace border
+      {
+          class SoftBevelBorder;
+      }
+    }
+  }
+}
+
+class javax::swing::border::SoftBevelBorder : public ::javax::swing::border::BevelBorder
+{
+
+public:
+  SoftBevelBorder(jint);
+  SoftBevelBorder(jint, ::java::awt::Color *, ::java::awt::Color *);
+  SoftBevelBorder(jint, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+  virtual jboolean isBorderOpaque();
+private:
+  static void paintSoftBevel(::java::awt::Graphics *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
+public: // actually package-private
+  static const jlong serialVersionUID = 5248789787305979975LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_border_SoftBevelBorder__
diff --git a/libjava/javax/swing/border/TitledBorder.h b/libjava/javax/swing/border/TitledBorder.h
new file mode 100644
index 000000000..42d6b599d
--- /dev/null
+++ b/libjava/javax/swing/border/TitledBorder.h
@@ -0,0 +1,104 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_border_TitledBorder__
+#define __javax_swing_border_TitledBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Dimension;
+        class Font;
+        class FontMetrics;
+        class Graphics;
+        class Insets;
+        class Point;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace border
+      {
+          class Border;
+          class TitledBorder;
+      }
+    }
+  }
+}
+
+class javax::swing::border::TitledBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  TitledBorder(::java::lang::String *);
+  TitledBorder(::javax::swing::border::Border *);
+  TitledBorder(::javax::swing::border::Border *, ::java::lang::String *);
+  TitledBorder(::javax::swing::border::Border *, ::java::lang::String *, jint, jint);
+  TitledBorder(::javax::swing::border::Border *, ::java::lang::String *, jint, jint, ::java::awt::Font *);
+  TitledBorder(::javax::swing::border::Border *, ::java::lang::String *, jint, jint, ::java::awt::Font *, ::java::awt::Color *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+private:
+  void layoutBorderWithTitle(::java::awt::Component *, ::java::awt::FontMetrics *, ::java::awt::Rectangle *, ::java::awt::Point *);
+  void paintBorderWithTitle(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint, ::java::awt::Rectangle *, ::java::awt::Point *, ::java::awt::FontMetrics *);
+public:
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+  virtual jboolean isBorderOpaque();
+  virtual ::java::lang::String * getTitle();
+  virtual ::javax::swing::border::Border * getBorder();
+  virtual jint getTitlePosition();
+  virtual jint getTitleJustification();
+  virtual ::java::awt::Font * getTitleFont();
+  virtual ::java::awt::Color * getTitleColor();
+  virtual void setTitle(::java::lang::String *);
+  virtual void setBorder(::javax::swing::border::Border *);
+  virtual void setTitlePosition(jint);
+  virtual void setTitleJustification(jint);
+  virtual void setTitleFont(::java::awt::Font *);
+  virtual void setTitleColor(::java::awt::Color *);
+  virtual ::java::awt::Dimension * getMinimumSize(::java::awt::Component *);
+public: // actually protected
+  virtual ::java::awt::Font * getFont(::java::awt::Component *);
+public:
+  static const jint DEFAULT_POSITION = 0;
+  static const jint ABOVE_TOP = 1;
+  static const jint TOP = 2;
+  static const jint BELOW_TOP = 3;
+  static const jint ABOVE_BOTTOM = 4;
+  static const jint BOTTOM = 5;
+  static const jint BELOW_BOTTOM = 6;
+  static const jint DEFAULT_JUSTIFICATION = 0;
+  static const jint LEFT = 1;
+  static const jint CENTER = 2;
+  static const jint RIGHT = 3;
+  static const jint LEADING = 4;
+  static const jint TRAILING = 5;
+public: // actually protected
+  static const jint EDGE_SPACING = 2;
+  static const jint TEXT_INSET_H = 5;
+  static const jint TEXT_SPACING = 2;
+public: // actually package-private
+  static const jlong serialVersionUID = 8012999415147721601LL;
+public: // actually protected
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) title;
+  ::javax::swing::border::Border * border;
+  jint titlePosition;
+  jint titleJustification;
+  ::java::awt::Font * titleFont;
+  ::java::awt::Color * titleColor;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_border_TitledBorder__
diff --git a/libjava/javax/swing/colorchooser/AbstractColorChooserPanel.h b/libjava/javax/swing/colorchooser/AbstractColorChooserPanel.h
new file mode 100644
index 000000000..99a4e743f
--- /dev/null
+++ b/libjava/javax/swing/colorchooser/AbstractColorChooserPanel.h
@@ -0,0 +1,63 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_colorchooser_AbstractColorChooserPanel__
+#define __javax_swing_colorchooser_AbstractColorChooserPanel__
+
+#pragma interface
+
+#include <javax/swing/JPanel.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+        class JColorChooser;
+      namespace colorchooser
+      {
+          class AbstractColorChooserPanel;
+          class ColorSelectionModel;
+      }
+    }
+  }
+}
+
+class javax::swing::colorchooser::AbstractColorChooserPanel : public ::javax::swing::JPanel
+{
+
+public:
+  AbstractColorChooserPanel();
+  virtual ::java::lang::String * getDisplayName() = 0;
+  virtual jint getMnemonic();
+  virtual jint getDisplayedMnemonicIndex();
+  virtual void updateChooser() = 0;
+public: // actually protected
+  virtual void buildChooser() = 0;
+public:
+  virtual ::javax::swing::Icon * getSmallDisplayIcon() = 0;
+  virtual ::javax::swing::Icon * getLargeDisplayIcon() = 0;
+  virtual void installChooserPanel(::javax::swing::JColorChooser *);
+  virtual void uninstallChooserPanel(::javax::swing::JColorChooser *);
+  virtual ::javax::swing::colorchooser::ColorSelectionModel * getColorSelectionModel();
+public: // actually protected
+  virtual ::java::awt::Color * getColorFromModel();
+public:
+  virtual void paint(::java::awt::Graphics *);
+private:
+  static const jlong serialVersionUID = -977469671210173863LL;
+  ::javax::swing::JColorChooser * __attribute__((aligned(__alignof__( ::javax::swing::JPanel)))) chooser;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_colorchooser_AbstractColorChooserPanel__
diff --git a/libjava/javax/swing/colorchooser/ColorChooserComponentFactory.h b/libjava/javax/swing/colorchooser/ColorChooserComponentFactory.h
new file mode 100644
index 000000000..495a5d14d
--- /dev/null
+++ b/libjava/javax/swing/colorchooser/ColorChooserComponentFactory.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_colorchooser_ColorChooserComponentFactory__
+#define __javax_swing_colorchooser_ColorChooserComponentFactory__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace colorchooser
+      {
+          class AbstractColorChooserPanel;
+          class ColorChooserComponentFactory;
+      }
+    }
+  }
+}
+
+class javax::swing::colorchooser::ColorChooserComponentFactory : public ::java::lang::Object
+{
+
+  ColorChooserComponentFactory();
+public:
+  static JArray< ::javax::swing::colorchooser::AbstractColorChooserPanel * > * getDefaultChooserPanels();
+  static ::javax::swing::JComponent * getPreviewPanel();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_colorchooser_ColorChooserComponentFactory__
diff --git a/libjava/javax/swing/colorchooser/ColorSelectionModel.h b/libjava/javax/swing/colorchooser/ColorSelectionModel.h
new file mode 100644
index 000000000..93bdab493
--- /dev/null
+++ b/libjava/javax/swing/colorchooser/ColorSelectionModel.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_colorchooser_ColorSelectionModel__
+#define __javax_swing_colorchooser_ColorSelectionModel__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace colorchooser
+      {
+          class ColorSelectionModel;
+      }
+      namespace event
+      {
+          class ChangeListener;
+      }
+    }
+  }
+}
+
+class javax::swing::colorchooser::ColorSelectionModel : public ::java::lang::Object
+{
+
+public:
+  virtual ::java::awt::Color * getSelectedColor() = 0;
+  virtual void setSelectedColor(::java::awt::Color *) = 0;
+  virtual void addChangeListener(::javax::swing::event::ChangeListener *) = 0;
+  virtual void removeChangeListener(::javax::swing::event::ChangeListener *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_colorchooser_ColorSelectionModel__
diff --git a/libjava/javax/swing/colorchooser/DefaultColorSelectionModel.h b/libjava/javax/swing/colorchooser/DefaultColorSelectionModel.h
new file mode 100644
index 000000000..52de9a303
--- /dev/null
+++ b/libjava/javax/swing/colorchooser/DefaultColorSelectionModel.h
@@ -0,0 +1,62 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_colorchooser_DefaultColorSelectionModel__
+#define __javax_swing_colorchooser_DefaultColorSelectionModel__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace colorchooser
+      {
+          class DefaultColorSelectionModel;
+      }
+      namespace event
+      {
+          class ChangeEvent;
+          class ChangeListener;
+          class EventListenerList;
+      }
+    }
+  }
+}
+
+class javax::swing::colorchooser::DefaultColorSelectionModel : public ::java::lang::Object
+{
+
+public:
+  DefaultColorSelectionModel();
+  DefaultColorSelectionModel(::java::awt::Color *);
+  virtual ::java::awt::Color * getSelectedColor();
+  virtual void setSelectedColor(::java::awt::Color *);
+  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
+  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
+  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
+public: // actually protected
+  virtual void fireStateChanged();
+private:
+  static const jlong serialVersionUID = -8117143602864778804LL;
+  ::java::awt::Color * __attribute__((aligned(__alignof__( ::java::lang::Object)))) selectedColor;
+public: // actually protected
+  ::javax::swing::event::ChangeEvent * changeEvent;
+  ::javax::swing::event::EventListenerList * listenerList;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_colorchooser_DefaultColorSelectionModel__
diff --git a/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$1.h b/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$1.h
new file mode 100644
index 000000000..685ea893a
--- /dev/null
+++ b/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$1.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_colorchooser_DefaultHSBChooserPanel$1__
+#define __javax_swing_colorchooser_DefaultHSBChooserPanel$1__
+
+#pragma interface
+
+#include <javax/swing/JPanel.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace colorchooser
+      {
+          class DefaultHSBChooserPanel;
+          class DefaultHSBChooserPanel$1;
+      }
+    }
+  }
+}
+
+class javax::swing::colorchooser::DefaultHSBChooserPanel$1 : public ::javax::swing::JPanel
+{
+
+public: // actually package-private
+  DefaultHSBChooserPanel$1(::javax::swing::colorchooser::DefaultHSBChooserPanel *);
+public:
+  virtual ::java::awt::Dimension * getPreferredSize();
+  virtual void paint(::java::awt::Graphics *);
+public: // actually package-private
+  ::javax::swing::colorchooser::DefaultHSBChooserPanel * __attribute__((aligned(__alignof__( ::javax::swing::JPanel)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_colorchooser_DefaultHSBChooserPanel$1__
diff --git a/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$2.h b/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$2.h
new file mode 100644
index 000000000..200cee2a9
--- /dev/null
+++ b/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$2.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_colorchooser_DefaultHSBChooserPanel$2__
+#define __javax_swing_colorchooser_DefaultHSBChooserPanel$2__
+
+#pragma interface
+
+#include <javax/swing/JPanel.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace colorchooser
+      {
+          class DefaultHSBChooserPanel;
+          class DefaultHSBChooserPanel$2;
+      }
+    }
+  }
+}
+
+class javax::swing::colorchooser::DefaultHSBChooserPanel$2 : public ::javax::swing::JPanel
+{
+
+public: // actually package-private
+  DefaultHSBChooserPanel$2(::javax::swing::colorchooser::DefaultHSBChooserPanel *);
+public:
+  virtual ::java::awt::Dimension * getPreferredSize();
+  virtual void paint(::java::awt::Graphics *);
+public: // actually package-private
+  ::javax::swing::colorchooser::DefaultHSBChooserPanel * __attribute__((aligned(__alignof__( ::javax::swing::JPanel)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_colorchooser_DefaultHSBChooserPanel$2__
diff --git a/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$ImageScrollListener.h b/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$ImageScrollListener.h
new file mode 100644
index 000000000..fdac4c42f
--- /dev/null
+++ b/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$ImageScrollListener.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_colorchooser_DefaultHSBChooserPanel$ImageScrollListener__
+#define __javax_swing_colorchooser_DefaultHSBChooserPanel$ImageScrollListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace colorchooser
+      {
+          class DefaultHSBChooserPanel;
+          class DefaultHSBChooserPanel$ImageScrollListener;
+      }
+      namespace event
+      {
+          class ChangeEvent;
+      }
+    }
+  }
+}
+
+class javax::swing::colorchooser::DefaultHSBChooserPanel$ImageScrollListener : public ::java::lang::Object
+{
+
+public: // actually package-private
+  DefaultHSBChooserPanel$ImageScrollListener(::javax::swing::colorchooser::DefaultHSBChooserPanel *);
+public:
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+public: // actually package-private
+  ::javax::swing::colorchooser::DefaultHSBChooserPanel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_colorchooser_DefaultHSBChooserPanel$ImageScrollListener__
diff --git a/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$MainGradientMouseListener.h b/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$MainGradientMouseListener.h
new file mode 100644
index 000000000..009e2ec84
--- /dev/null
+++ b/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$MainGradientMouseListener.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_colorchooser_DefaultHSBChooserPanel$MainGradientMouseListener__
+#define __javax_swing_colorchooser_DefaultHSBChooserPanel$MainGradientMouseListener__
+
+#pragma interface
+
+#include <java/awt/event/MouseAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Point;
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace colorchooser
+      {
+          class DefaultHSBChooserPanel;
+          class DefaultHSBChooserPanel$MainGradientMouseListener;
+      }
+    }
+  }
+}
+
+class javax::swing::colorchooser::DefaultHSBChooserPanel$MainGradientMouseListener : public ::java::awt::event::MouseAdapter
+{
+
+public: // actually package-private
+  DefaultHSBChooserPanel$MainGradientMouseListener(::javax::swing::colorchooser::DefaultHSBChooserPanel *);
+public:
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+private:
+  void update(::java::awt::Point *);
+  void updateH(::java::awt::Point *);
+  void updateS(::java::awt::Point *);
+  void updateB(::java::awt::Point *);
+public: // actually package-private
+  ::javax::swing::colorchooser::DefaultHSBChooserPanel * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_colorchooser_DefaultHSBChooserPanel$MainGradientMouseListener__
diff --git a/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$RadioStateListener.h b/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$RadioStateListener.h
new file mode 100644
index 000000000..9384d465d
--- /dev/null
+++ b/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$RadioStateListener.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_colorchooser_DefaultHSBChooserPanel$RadioStateListener__
+#define __javax_swing_colorchooser_DefaultHSBChooserPanel$RadioStateListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace colorchooser
+      {
+          class DefaultHSBChooserPanel;
+          class DefaultHSBChooserPanel$RadioStateListener;
+      }
+      namespace event
+      {
+          class ChangeEvent;
+      }
+    }
+  }
+}
+
+class javax::swing::colorchooser::DefaultHSBChooserPanel$RadioStateListener : public ::java::lang::Object
+{
+
+public: // actually package-private
+  DefaultHSBChooserPanel$RadioStateListener(::javax::swing::colorchooser::DefaultHSBChooserPanel *);
+public:
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+public: // actually package-private
+  ::javax::swing::colorchooser::DefaultHSBChooserPanel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_colorchooser_DefaultHSBChooserPanel$RadioStateListener__
diff --git a/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$SliderChangeListener.h b/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$SliderChangeListener.h
new file mode 100644
index 000000000..22bb90d55
--- /dev/null
+++ b/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$SliderChangeListener.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_colorchooser_DefaultHSBChooserPanel$SliderChangeListener__
+#define __javax_swing_colorchooser_DefaultHSBChooserPanel$SliderChangeListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace colorchooser
+      {
+          class DefaultHSBChooserPanel;
+          class DefaultHSBChooserPanel$SliderChangeListener;
+      }
+      namespace event
+      {
+          class ChangeEvent;
+      }
+    }
+  }
+}
+
+class javax::swing::colorchooser::DefaultHSBChooserPanel$SliderChangeListener : public ::java::lang::Object
+{
+
+public: // actually package-private
+  DefaultHSBChooserPanel$SliderChangeListener(::javax::swing::colorchooser::DefaultHSBChooserPanel *);
+public:
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+public: // actually package-private
+  ::javax::swing::colorchooser::DefaultHSBChooserPanel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_colorchooser_DefaultHSBChooserPanel$SliderChangeListener__
diff --git a/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel.h b/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel.h
new file mode 100644
index 000000000..f6fc5d950
--- /dev/null
+++ b/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel.h
@@ -0,0 +1,116 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_colorchooser_DefaultHSBChooserPanel__
+#define __javax_swing_colorchooser_DefaultHSBChooserPanel__
+
+#pragma interface
+
+#include <javax/swing/colorchooser/AbstractColorChooserPanel.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Container;
+        class Graphics;
+        class Image;
+        class Point;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+        class JColorChooser;
+        class JLabel;
+        class JPanel;
+        class JRadioButton;
+        class JSlider;
+        class JSpinner;
+      namespace colorchooser
+      {
+          class DefaultHSBChooserPanel;
+      }
+    }
+  }
+}
+
+class javax::swing::colorchooser::DefaultHSBChooserPanel : public ::javax::swing::colorchooser::AbstractColorChooserPanel
+{
+
+public: // actually package-private
+  DefaultHSBChooserPanel();
+public:
+  virtual ::java::lang::String * getDisplayName();
+  virtual void updateChooser();
+public: // actually protected
+  virtual void buildChooser();
+public:
+  virtual void uninstallChooserPanel(::javax::swing::JColorChooser *);
+private:
+  ::java::awt::Container * buildRightPanel();
+public:
+  virtual ::javax::swing::Icon * getSmallDisplayIcon();
+  virtual ::javax::swing::Icon * getLargeDisplayIcon();
+  virtual void paint(::java::awt::Graphics *);
+private:
+  void updateHLockImage();
+  void updateBLockImage();
+  void updateSLockImage();
+public: // actually package-private
+  virtual void updateImage();
+private:
+  void updateTextFields();
+public: // actually package-private
+  virtual void updateSlider();
+  virtual void updateTrack();
+private:
+  void updateHTrack();
+  void updateSTrack();
+  void updateBTrack();
+  JArray< jfloat > * getHSBValues();
+public: // actually package-private
+  ::java::awt::Image * __attribute__((aligned(__alignof__( ::javax::swing::colorchooser::AbstractColorChooserPanel)))) gradientImage;
+private:
+  ::javax::swing::JPanel * gradientPanel;
+public: // actually package-private
+  ::java::awt::Image * trackImage;
+private:
+  ::javax::swing::JPanel * trackPanel;
+public: // actually package-private
+  ::javax::swing::JSlider * slider;
+  ::javax::swing::JRadioButton * hRadio;
+  ::javax::swing::JRadioButton * sRadio;
+  ::javax::swing::JRadioButton * bRadio;
+  ::javax::swing::JSpinner * hSpinner;
+  ::javax::swing::JSpinner * sSpinner;
+  ::javax::swing::JSpinner * bSpinner;
+private:
+  static const jint imgWidth = 200;
+  static const jint imgHeight = 200;
+  static const jint trackWidth = 30;
+  static ::javax::swing::JLabel * R;
+  static ::javax::swing::JLabel * G;
+  static ::javax::swing::JLabel * B;
+  ::javax::swing::JLabel * rFull;
+  ::javax::swing::JLabel * gFull;
+  ::javax::swing::JLabel * bFull;
+public: // actually package-private
+  ::java::awt::Point * gradientPoint;
+  jboolean internalChange;
+  jboolean spinnerTrigger;
+  jint locked;
+  static const jint HLOCKED = 0;
+  static const jint SLOCKED = 1;
+  static const jint BLOCKED = 2;
+  jboolean handlingMouse;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_colorchooser_DefaultHSBChooserPanel__
diff --git a/libjava/javax/swing/colorchooser/DefaultPreviewPanel$PreviewBorder.h b/libjava/javax/swing/colorchooser/DefaultPreviewPanel$PreviewBorder.h
new file mode 100644
index 000000000..f6b099792
--- /dev/null
+++ b/libjava/javax/swing/colorchooser/DefaultPreviewPanel$PreviewBorder.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_colorchooser_DefaultPreviewPanel$PreviewBorder__
+#define __javax_swing_colorchooser_DefaultPreviewPanel$PreviewBorder__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace colorchooser
+      {
+          class DefaultPreviewPanel;
+          class DefaultPreviewPanel$PreviewBorder;
+      }
+    }
+  }
+}
+
+class javax::swing::colorchooser::DefaultPreviewPanel$PreviewBorder : public ::java::lang::Object
+{
+
+public: // actually package-private
+  DefaultPreviewPanel$PreviewBorder(::javax::swing::colorchooser::DefaultPreviewPanel *);
+public:
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual jboolean isBorderOpaque();
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+private:
+  static const jint edge = 20;
+  static const jint lead = 5;
+  static const jint gap = 3;
+public: // actually package-private
+  ::javax::swing::colorchooser::DefaultPreviewPanel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_colorchooser_DefaultPreviewPanel$PreviewBorder__
diff --git a/libjava/javax/swing/colorchooser/DefaultPreviewPanel.h b/libjava/javax/swing/colorchooser/DefaultPreviewPanel.h
new file mode 100644
index 000000000..7348bd53b
--- /dev/null
+++ b/libjava/javax/swing/colorchooser/DefaultPreviewPanel.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_colorchooser_DefaultPreviewPanel__
+#define __javax_swing_colorchooser_DefaultPreviewPanel__
+
+#pragma interface
+
+#include <javax/swing/JPanel.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace colorchooser
+      {
+          class DefaultPreviewPanel;
+      }
+    }
+  }
+}
+
+class javax::swing::colorchooser::DefaultPreviewPanel : public ::javax::swing::JPanel
+{
+
+public: // actually package-private
+  DefaultPreviewPanel();
+public:
+  virtual void paint(::java::awt::Graphics *);
+private:
+  void paintSquare(::java::awt::Graphics *, jint, jint, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, jint, jint, jint);
+public:
+  virtual ::java::awt::Dimension * getPreferredSize();
+private:
+  static jint largeGap;
+  static jint smallGap;
+  static jint squareSize;
+  static jint textPadding;
+  static jint rightSideRectWidth;
+  static ::java::lang::String * sample;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_colorchooser_DefaultPreviewPanel__
diff --git a/libjava/javax/swing/colorchooser/DefaultRGBChooserPanel$SliderHandler.h b/libjava/javax/swing/colorchooser/DefaultRGBChooserPanel$SliderHandler.h
new file mode 100644
index 000000000..1026b6d1a
--- /dev/null
+++ b/libjava/javax/swing/colorchooser/DefaultRGBChooserPanel$SliderHandler.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_colorchooser_DefaultRGBChooserPanel$SliderHandler__
+#define __javax_swing_colorchooser_DefaultRGBChooserPanel$SliderHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace colorchooser
+      {
+          class DefaultRGBChooserPanel;
+          class DefaultRGBChooserPanel$SliderHandler;
+      }
+      namespace event
+      {
+          class ChangeEvent;
+      }
+    }
+  }
+}
+
+class javax::swing::colorchooser::DefaultRGBChooserPanel$SliderHandler : public ::java::lang::Object
+{
+
+public: // actually package-private
+  DefaultRGBChooserPanel$SliderHandler(::javax::swing::colorchooser::DefaultRGBChooserPanel *);
+public:
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+public: // actually package-private
+  ::javax::swing::colorchooser::DefaultRGBChooserPanel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_colorchooser_DefaultRGBChooserPanel$SliderHandler__
diff --git a/libjava/javax/swing/colorchooser/DefaultRGBChooserPanel$SpinnerHandler.h b/libjava/javax/swing/colorchooser/DefaultRGBChooserPanel$SpinnerHandler.h
new file mode 100644
index 000000000..85ba288ce
--- /dev/null
+++ b/libjava/javax/swing/colorchooser/DefaultRGBChooserPanel$SpinnerHandler.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_colorchooser_DefaultRGBChooserPanel$SpinnerHandler__
+#define __javax_swing_colorchooser_DefaultRGBChooserPanel$SpinnerHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace colorchooser
+      {
+          class DefaultRGBChooserPanel;
+          class DefaultRGBChooserPanel$SpinnerHandler;
+      }
+      namespace event
+      {
+          class ChangeEvent;
+      }
+    }
+  }
+}
+
+class javax::swing::colorchooser::DefaultRGBChooserPanel$SpinnerHandler : public ::java::lang::Object
+{
+
+public: // actually package-private
+  DefaultRGBChooserPanel$SpinnerHandler(::javax::swing::colorchooser::DefaultRGBChooserPanel *);
+public:
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+public: // actually package-private
+  ::javax::swing::colorchooser::DefaultRGBChooserPanel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_colorchooser_DefaultRGBChooserPanel$SpinnerHandler__
diff --git a/libjava/javax/swing/colorchooser/DefaultRGBChooserPanel.h b/libjava/javax/swing/colorchooser/DefaultRGBChooserPanel.h
new file mode 100644
index 000000000..c9cc7afc3
--- /dev/null
+++ b/libjava/javax/swing/colorchooser/DefaultRGBChooserPanel.h
@@ -0,0 +1,81 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_colorchooser_DefaultRGBChooserPanel__
+#define __javax_swing_colorchooser_DefaultRGBChooserPanel__
+
+#pragma interface
+
+#include <javax/swing/colorchooser/AbstractColorChooserPanel.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+        class JColorChooser;
+        class JLabel;
+        class JSlider;
+        class JSpinner;
+      namespace colorchooser
+      {
+          class DefaultRGBChooserPanel;
+      }
+      namespace event
+      {
+          class ChangeListener;
+      }
+    }
+  }
+}
+
+class javax::swing::colorchooser::DefaultRGBChooserPanel : public ::javax::swing::colorchooser::AbstractColorChooserPanel
+{
+
+public:
+  DefaultRGBChooserPanel();
+  virtual ::java::lang::String * getDisplayName();
+  virtual void updateChooser();
+public: // actually protected
+  virtual void buildChooser();
+public:
+  virtual void uninstallChooserPanel(::javax::swing::JColorChooser *);
+private:
+  void uninstallListeners();
+  void installListeners();
+public:
+  virtual ::javax::swing::Icon * getSmallDisplayIcon();
+  virtual ::javax::swing::Icon * getLargeDisplayIcon();
+  virtual void paint(::java::awt::Graphics *);
+public: // actually package-private
+  jboolean __attribute__((aligned(__alignof__( ::javax::swing::colorchooser::AbstractColorChooserPanel)))) spinnerChange;
+  jboolean sliderChange;
+  jboolean updateChange;
+private:
+  ::javax::swing::event::ChangeListener * colorChanger;
+  ::javax::swing::event::ChangeListener * spinnerHandler;
+public: // actually package-private
+  ::javax::swing::JSlider * R;
+  ::javax::swing::JSlider * G;
+  ::javax::swing::JSlider * B;
+private:
+  ::javax::swing::JLabel * RLabel;
+  ::javax::swing::JLabel * GLabel;
+  ::javax::swing::JLabel * BLabel;
+public: // actually package-private
+  ::javax::swing::JSpinner * RSpinner;
+  ::javax::swing::JSpinner * GSpinner;
+  ::javax::swing::JSpinner * BSpinner;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_colorchooser_DefaultRGBChooserPanel__
diff --git a/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$MainPanelLayout.h b/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$MainPanelLayout.h
new file mode 100644
index 000000000..411933085
--- /dev/null
+++ b/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$MainPanelLayout.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_colorchooser_DefaultSwatchChooserPanel$MainPanelLayout__
+#define __javax_swing_colorchooser_DefaultSwatchChooserPanel$MainPanelLayout__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace colorchooser
+      {
+          class DefaultSwatchChooserPanel$MainPanelLayout;
+      }
+    }
+  }
+}
+
+class javax::swing::colorchooser::DefaultSwatchChooserPanel$MainPanelLayout : public ::java::lang::Object
+{
+
+public: // actually package-private
+  DefaultSwatchChooserPanel$MainPanelLayout();
+public:
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+  virtual void layoutContainer(::java::awt::Container *);
+  virtual void removeLayoutComponent(::java::awt::Component *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_colorchooser_DefaultSwatchChooserPanel$MainPanelLayout__
diff --git a/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$MainSwatchPanel.h b/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$MainSwatchPanel.h
new file mode 100644
index 000000000..9a33fe149
--- /dev/null
+++ b/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$MainSwatchPanel.h
@@ -0,0 +1,81 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_colorchooser_DefaultSwatchChooserPanel$MainSwatchPanel__
+#define __javax_swing_colorchooser_DefaultSwatchChooserPanel$MainSwatchPanel__
+
+#pragma interface
+
+#include <javax/swing/colorchooser/DefaultSwatchChooserPanel$SwatchPanel.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Graphics;
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace colorchooser
+      {
+          class DefaultSwatchChooserPanel$MainSwatchPanel;
+      }
+    }
+  }
+}
+
+class javax::swing::colorchooser::DefaultSwatchChooserPanel$MainSwatchPanel : public ::javax::swing::colorchooser::DefaultSwatchChooserPanel$SwatchPanel
+{
+
+public: // actually package-private
+  DefaultSwatchChooserPanel$MainSwatchPanel();
+public:
+  virtual ::java::awt::Color * getColorForPosition(jint, jint);
+public: // actually protected
+  virtual void initializeColors();
+public:
+  virtual void paint(::java::awt::Graphics *);
+  virtual ::java::lang::String * getToolTipText(::java::awt::event::MouseEvent *);
+  static ::java::awt::Color * C204255255;
+  static ::java::awt::Color * C255204204;
+  static ::java::awt::Color * C204255204;
+  static ::java::awt::Color * C204204204;
+  static ::java::awt::Color * C153153255;
+  static ::java::awt::Color * C051051255;
+  static ::java::awt::Color * C153000153;
+  static ::java::awt::Color * C000051051;
+  static ::java::awt::Color * C051000051;
+  static ::java::awt::Color * C051051000;
+  static ::java::awt::Color * C102102000;
+  static ::java::awt::Color * C153255153;
+  static ::java::awt::Color * C102255102;
+  static ::java::awt::Color * C000102102;
+  static ::java::awt::Color * C102000102;
+  static ::java::awt::Color * C000153153;
+  static ::java::awt::Color * C153153000;
+  static ::java::awt::Color * C204204000;
+  static ::java::awt::Color * C204000204;
+  static ::java::awt::Color * C000204204;
+  static ::java::awt::Color * C051255051;
+  static ::java::awt::Color * C255051051;
+  static ::java::awt::Color * C255102102;
+  static ::java::awt::Color * C102102255;
+  static ::java::awt::Color * C255153153;
+public: // actually package-private
+  static JArray< ::java::awt::Color * > * colors;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_colorchooser_DefaultSwatchChooserPanel$MainSwatchPanel__
diff --git a/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$MouseHandler.h b/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$MouseHandler.h
new file mode 100644
index 000000000..b1de67fc4
--- /dev/null
+++ b/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$MouseHandler.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_colorchooser_DefaultSwatchChooserPanel$MouseHandler__
+#define __javax_swing_colorchooser_DefaultSwatchChooserPanel$MouseHandler__
+
+#pragma interface
+
+#include <java/awt/event/MouseAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace colorchooser
+      {
+          class DefaultSwatchChooserPanel;
+          class DefaultSwatchChooserPanel$MouseHandler;
+      }
+    }
+  }
+}
+
+class javax::swing::colorchooser::DefaultSwatchChooserPanel$MouseHandler : public ::java::awt::event::MouseAdapter
+{
+
+public: // actually package-private
+  DefaultSwatchChooserPanel$MouseHandler(::javax::swing::colorchooser::DefaultSwatchChooserPanel *);
+public:
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  ::javax::swing::colorchooser::DefaultSwatchChooserPanel * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_colorchooser_DefaultSwatchChooserPanel$MouseHandler__
diff --git a/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$RecentPanelLayout.h b/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$RecentPanelLayout.h
new file mode 100644
index 000000000..d4ce35b18
--- /dev/null
+++ b/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$RecentPanelLayout.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_colorchooser_DefaultSwatchChooserPanel$RecentPanelLayout__
+#define __javax_swing_colorchooser_DefaultSwatchChooserPanel$RecentPanelLayout__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace colorchooser
+      {
+          class DefaultSwatchChooserPanel$RecentPanelLayout;
+      }
+    }
+  }
+}
+
+class javax::swing::colorchooser::DefaultSwatchChooserPanel$RecentPanelLayout : public ::java::lang::Object
+{
+
+public: // actually package-private
+  DefaultSwatchChooserPanel$RecentPanelLayout();
+public:
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+  virtual void layoutContainer(::java::awt::Container *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  virtual void removeLayoutComponent(::java::awt::Component *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_colorchooser_DefaultSwatchChooserPanel$RecentPanelLayout__
diff --git a/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$RecentSwatchPanel.h b/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$RecentSwatchPanel.h
new file mode 100644
index 000000000..bbb78b807
--- /dev/null
+++ b/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$RecentSwatchPanel.h
@@ -0,0 +1,64 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_colorchooser_DefaultSwatchChooserPanel$RecentSwatchPanel__
+#define __javax_swing_colorchooser_DefaultSwatchChooserPanel$RecentSwatchPanel__
+
+#pragma interface
+
+#include <javax/swing/colorchooser/DefaultSwatchChooserPanel$SwatchPanel.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Graphics;
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace colorchooser
+      {
+          class DefaultSwatchChooserPanel$RecentSwatchPanel;
+      }
+    }
+  }
+}
+
+class javax::swing::colorchooser::DefaultSwatchChooserPanel$RecentSwatchPanel : public ::javax::swing::colorchooser::DefaultSwatchChooserPanel$SwatchPanel
+{
+
+public: // actually package-private
+  DefaultSwatchChooserPanel$RecentSwatchPanel();
+public:
+  virtual ::java::awt::Color * getColorForPosition(jint, jint);
+public: // actually protected
+  virtual void initializeColors();
+private:
+  jint getIndexForCell(jint, jint);
+public: // actually package-private
+  virtual void addColorToQueue(::java::awt::Color *);
+public:
+  virtual void paint(::java::awt::Graphics *);
+  virtual ::java::lang::String * getToolTipText(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  JArray< ::java::awt::Color * > * __attribute__((aligned(__alignof__( ::javax::swing::colorchooser::DefaultSwatchChooserPanel$SwatchPanel)))) colors;
+public:
+  static ::java::awt::Color * defaultColor;
+public: // actually package-private
+  jint start;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_colorchooser_DefaultSwatchChooserPanel$RecentSwatchPanel__
diff --git a/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$SwatchPanel.h b/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$SwatchPanel.h
new file mode 100644
index 000000000..39c053926
--- /dev/null
+++ b/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$SwatchPanel.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_colorchooser_DefaultSwatchChooserPanel$SwatchPanel__
+#define __javax_swing_colorchooser_DefaultSwatchChooserPanel$SwatchPanel__
+
+#pragma interface
+
+#include <javax/swing/JPanel.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace colorchooser
+      {
+          class DefaultSwatchChooserPanel$SwatchPanel;
+      }
+    }
+  }
+}
+
+class javax::swing::colorchooser::DefaultSwatchChooserPanel$SwatchPanel : public ::javax::swing::JPanel
+{
+
+public: // actually package-private
+  DefaultSwatchChooserPanel$SwatchPanel();
+public:
+  virtual ::java::awt::Dimension * getPreferredSize();
+  virtual ::java::awt::Color * getColorForPosition(jint, jint) = 0;
+public: // actually protected
+  virtual void initializeColors() = 0;
+  jint __attribute__((aligned(__alignof__( ::javax::swing::JPanel)))) cellWidth;
+  jint cellHeight;
+  jint gap;
+  jint numRows;
+  jint numCols;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_colorchooser_DefaultSwatchChooserPanel$SwatchPanel__
diff --git a/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel.h b/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel.h
new file mode 100644
index 000000000..8db2fc664
--- /dev/null
+++ b/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel.h
@@ -0,0 +1,64 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_colorchooser_DefaultSwatchChooserPanel__
+#define __javax_swing_colorchooser_DefaultSwatchChooserPanel__
+
+#pragma interface
+
+#include <javax/swing/colorchooser/AbstractColorChooserPanel.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+      namespace event
+      {
+          class MouseEvent;
+          class MouseListener;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+        class JColorChooser;
+      namespace colorchooser
+      {
+          class DefaultSwatchChooserPanel;
+          class DefaultSwatchChooserPanel$MainSwatchPanel;
+          class DefaultSwatchChooserPanel$RecentSwatchPanel;
+      }
+    }
+  }
+}
+
+class javax::swing::colorchooser::DefaultSwatchChooserPanel : public ::javax::swing::colorchooser::AbstractColorChooserPanel
+{
+
+public: // actually package-private
+  DefaultSwatchChooserPanel();
+public:
+  virtual void updateChooser();
+public: // actually protected
+  virtual void buildChooser();
+public:
+  virtual void uninstallChooserPanel(::javax::swing::JColorChooser *);
+  virtual ::java::lang::String * getDisplayName();
+  virtual ::javax::swing::Icon * getSmallDisplayIcon();
+  virtual ::javax::swing::Icon * getLargeDisplayIcon();
+  virtual void paint(::java::awt::Graphics *);
+  virtual ::java::lang::String * getToolTipText(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  ::javax::swing::colorchooser::DefaultSwatchChooserPanel$MainSwatchPanel * __attribute__((aligned(__alignof__( ::javax::swing::colorchooser::AbstractColorChooserPanel)))) mainPalette;
+  ::javax::swing::colorchooser::DefaultSwatchChooserPanel$RecentSwatchPanel * recentPalette;
+  ::java::awt::event::MouseListener * mouseHandler;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_colorchooser_DefaultSwatchChooserPanel__
diff --git a/libjava/javax/swing/event/AncestorEvent.h b/libjava/javax/swing/event/AncestorEvent.h
new file mode 100644
index 000000000..6966e58fc
--- /dev/null
+++ b/libjava/javax/swing/event/AncestorEvent.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_AncestorEvent__
+#define __javax_swing_event_AncestorEvent__
+
+#pragma interface
+
+#include <java/awt/AWTEvent.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Container;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace event
+      {
+          class AncestorEvent;
+      }
+    }
+  }
+}
+
+class javax::swing::event::AncestorEvent : public ::java::awt::AWTEvent
+{
+
+public:
+  AncestorEvent(::javax::swing::JComponent *, jint, ::java::awt::Container *, ::java::awt::Container *);
+  virtual ::java::awt::Container * getAncestor();
+  virtual ::java::awt::Container * getAncestorParent();
+  virtual ::javax::swing::JComponent * getComponent();
+private:
+  static const jlong serialVersionUID = -8079801679695605002LL;
+public:
+  static const jint ANCESTOR_ADDED = 1;
+  static const jint ANCESTOR_REMOVED = 2;
+  static const jint ANCESTOR_MOVED = 3;
+private:
+  ::javax::swing::JComponent * __attribute__((aligned(__alignof__( ::java::awt::AWTEvent)))) sourceComponent;
+  ::java::awt::Container * ancestor;
+  ::java::awt::Container * ancestorParent;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_event_AncestorEvent__
diff --git a/libjava/javax/swing/event/AncestorListener.h b/libjava/javax/swing/event/AncestorListener.h
new file mode 100644
index 000000000..2e2a162c0
--- /dev/null
+++ b/libjava/javax/swing/event/AncestorListener.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_AncestorListener__
+#define __javax_swing_event_AncestorListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class AncestorEvent;
+          class AncestorListener;
+      }
+    }
+  }
+}
+
+class javax::swing::event::AncestorListener : public ::java::lang::Object
+{
+
+public:
+  virtual void ancestorAdded(::javax::swing::event::AncestorEvent *) = 0;
+  virtual void ancestorRemoved(::javax::swing::event::AncestorEvent *) = 0;
+  virtual void ancestorMoved(::javax::swing::event::AncestorEvent *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_event_AncestorListener__
diff --git a/libjava/javax/swing/event/CaretEvent.h b/libjava/javax/swing/event/CaretEvent.h
new file mode 100644
index 000000000..29f32e8d0
--- /dev/null
+++ b/libjava/javax/swing/event/CaretEvent.h
@@ -0,0 +1,34 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_CaretEvent__
+#define __javax_swing_event_CaretEvent__
+
+#pragma interface
+
+#include <java/util/EventObject.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class CaretEvent;
+      }
+    }
+  }
+}
+
+class javax::swing::event::CaretEvent : public ::java::util::EventObject
+{
+
+public:
+  CaretEvent(::java::lang::Object *);
+  virtual jint getDot() = 0;
+  virtual jint getMark() = 0;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_event_CaretEvent__
diff --git a/libjava/javax/swing/event/CaretListener.h b/libjava/javax/swing/event/CaretListener.h
new file mode 100644
index 000000000..9169c866a
--- /dev/null
+++ b/libjava/javax/swing/event/CaretListener.h
@@ -0,0 +1,33 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_CaretListener__
+#define __javax_swing_event_CaretListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class CaretEvent;
+          class CaretListener;
+      }
+    }
+  }
+}
+
+class javax::swing::event::CaretListener : public ::java::lang::Object
+{
+
+public:
+  virtual void caretUpdate(::javax::swing::event::CaretEvent *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_event_CaretListener__
diff --git a/libjava/javax/swing/event/CellEditorListener.h b/libjava/javax/swing/event/CellEditorListener.h
new file mode 100644
index 000000000..8f4bcfeb5
--- /dev/null
+++ b/libjava/javax/swing/event/CellEditorListener.h
@@ -0,0 +1,34 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_CellEditorListener__
+#define __javax_swing_event_CellEditorListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class CellEditorListener;
+          class ChangeEvent;
+      }
+    }
+  }
+}
+
+class javax::swing::event::CellEditorListener : public ::java::lang::Object
+{
+
+public:
+  virtual void editingCanceled(::javax::swing::event::ChangeEvent *) = 0;
+  virtual void editingStopped(::javax::swing::event::ChangeEvent *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_event_CellEditorListener__
diff --git a/libjava/javax/swing/event/ChangeEvent.h b/libjava/javax/swing/event/ChangeEvent.h
new file mode 100644
index 000000000..afec4258b
--- /dev/null
+++ b/libjava/javax/swing/event/ChangeEvent.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_ChangeEvent__
+#define __javax_swing_event_ChangeEvent__
+
+#pragma interface
+
+#include <java/util/EventObject.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ChangeEvent;
+      }
+    }
+  }
+}
+
+class javax::swing::event::ChangeEvent : public ::java::util::EventObject
+{
+
+public:
+  ChangeEvent(::java::lang::Object *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_event_ChangeEvent__
diff --git a/libjava/javax/swing/event/ChangeListener.h b/libjava/javax/swing/event/ChangeListener.h
new file mode 100644
index 000000000..fc80ec7fe
--- /dev/null
+++ b/libjava/javax/swing/event/ChangeListener.h
@@ -0,0 +1,33 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_ChangeListener__
+#define __javax_swing_event_ChangeListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ChangeEvent;
+          class ChangeListener;
+      }
+    }
+  }
+}
+
+class javax::swing::event::ChangeListener : public ::java::lang::Object
+{
+
+public:
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_event_ChangeListener__
diff --git a/libjava/javax/swing/event/DocumentEvent$ElementChange.h b/libjava/javax/swing/event/DocumentEvent$ElementChange.h
new file mode 100644
index 000000000..c94fc6941
--- /dev/null
+++ b/libjava/javax/swing/event/DocumentEvent$ElementChange.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_DocumentEvent$ElementChange__
+#define __javax_swing_event_DocumentEvent$ElementChange__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class DocumentEvent$ElementChange;
+      }
+      namespace text
+      {
+          class Element;
+      }
+    }
+  }
+}
+
+class javax::swing::event::DocumentEvent$ElementChange : public ::java::lang::Object
+{
+
+public:
+  virtual jint getIndex() = 0;
+  virtual ::javax::swing::text::Element * getElement() = 0;
+  virtual JArray< ::javax::swing::text::Element * > * getChildrenRemoved() = 0;
+  virtual JArray< ::javax::swing::text::Element * > * getChildrenAdded() = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_event_DocumentEvent$ElementChange__
diff --git a/libjava/javax/swing/event/DocumentEvent$EventType.h b/libjava/javax/swing/event/DocumentEvent$EventType.h
new file mode 100644
index 000000000..b09a8e2bf
--- /dev/null
+++ b/libjava/javax/swing/event/DocumentEvent$EventType.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_DocumentEvent$EventType__
+#define __javax_swing_event_DocumentEvent$EventType__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class DocumentEvent$EventType;
+      }
+    }
+  }
+}
+
+class javax::swing::event::DocumentEvent$EventType : public ::java::lang::Object
+{
+
+  DocumentEvent$EventType(::java::lang::String *);
+public:
+  ::java::lang::String * toString();
+  static ::javax::swing::event::DocumentEvent$EventType * INSERT;
+  static ::javax::swing::event::DocumentEvent$EventType * REMOVE;
+  static ::javax::swing::event::DocumentEvent$EventType * CHANGE;
+private:
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_event_DocumentEvent$EventType__
diff --git a/libjava/javax/swing/event/DocumentEvent.h b/libjava/javax/swing/event/DocumentEvent.h
new file mode 100644
index 000000000..7d6587d2f
--- /dev/null
+++ b/libjava/javax/swing/event/DocumentEvent.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_DocumentEvent__
+#define __javax_swing_event_DocumentEvent__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class DocumentEvent;
+          class DocumentEvent$ElementChange;
+          class DocumentEvent$EventType;
+      }
+      namespace text
+      {
+          class Document;
+          class Element;
+      }
+    }
+  }
+}
+
+class javax::swing::event::DocumentEvent : public ::java::lang::Object
+{
+
+public:
+  virtual ::javax::swing::event::DocumentEvent$EventType * getType() = 0;
+  virtual jint getOffset() = 0;
+  virtual jint getLength() = 0;
+  virtual ::javax::swing::text::Document * getDocument() = 0;
+  virtual ::javax::swing::event::DocumentEvent$ElementChange * getChange(::javax::swing::text::Element *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_event_DocumentEvent__
diff --git a/libjava/javax/swing/event/DocumentListener.h b/libjava/javax/swing/event/DocumentListener.h
new file mode 100644
index 000000000..e836e5f3f
--- /dev/null
+++ b/libjava/javax/swing/event/DocumentListener.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_DocumentListener__
+#define __javax_swing_event_DocumentListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class DocumentEvent;
+          class DocumentListener;
+      }
+    }
+  }
+}
+
+class javax::swing::event::DocumentListener : public ::java::lang::Object
+{
+
+public:
+  virtual void changedUpdate(::javax::swing::event::DocumentEvent *) = 0;
+  virtual void insertUpdate(::javax::swing::event::DocumentEvent *) = 0;
+  virtual void removeUpdate(::javax::swing::event::DocumentEvent *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_event_DocumentListener__
diff --git a/libjava/javax/swing/event/EventListenerList.h b/libjava/javax/swing/event/EventListenerList.h
new file mode 100644
index 000000000..25209af62
--- /dev/null
+++ b/libjava/javax/swing/event/EventListenerList.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_EventListenerList__
+#define __javax_swing_event_EventListenerList__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class EventListenerList;
+      }
+    }
+  }
+}
+
+class javax::swing::event::EventListenerList : public ::java::lang::Object
+{
+
+public:
+  EventListenerList();
+  virtual void add(::java::lang::Class *, ::java::util::EventListener *);
+  virtual jint getListenerCount();
+  virtual jint getListenerCount(::java::lang::Class *);
+  virtual JArray< ::java::lang::Object * > * getListenerList();
+  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
+  virtual void remove(::java::lang::Class *, ::java::util::EventListener *);
+  virtual ::java::lang::String * toString();
+private:
+  void writeObject(::java::io::ObjectOutputStream *);
+  void readObject(::java::io::ObjectInputStream *);
+public: // actually package-private
+  static const jlong serialVersionUID = -5677132037850737084LL;
+private:
+  static JArray< ::java::lang::Object * > * NO_LISTENERS;
+public: // actually protected
+  JArray< ::java::lang::Object * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) listenerList;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_event_EventListenerList__
diff --git a/libjava/javax/swing/event/HyperlinkEvent$EventType.h b/libjava/javax/swing/event/HyperlinkEvent$EventType.h
new file mode 100644
index 000000000..65bc22e17
--- /dev/null
+++ b/libjava/javax/swing/event/HyperlinkEvent$EventType.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_HyperlinkEvent$EventType__
+#define __javax_swing_event_HyperlinkEvent$EventType__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class HyperlinkEvent$EventType;
+      }
+    }
+  }
+}
+
+class javax::swing::event::HyperlinkEvent$EventType : public ::java::lang::Object
+{
+
+  HyperlinkEvent$EventType(::java::lang::String *);
+public:
+  ::java::lang::String * toString();
+  static ::javax::swing::event::HyperlinkEvent$EventType * ENTERED;
+  static ::javax::swing::event::HyperlinkEvent$EventType * EXITED;
+  static ::javax::swing::event::HyperlinkEvent$EventType * ACTIVATED;
+private:
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_event_HyperlinkEvent$EventType__
diff --git a/libjava/javax/swing/event/HyperlinkEvent.h b/libjava/javax/swing/event/HyperlinkEvent.h
new file mode 100644
index 000000000..af86e8c1f
--- /dev/null
+++ b/libjava/javax/swing/event/HyperlinkEvent.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_HyperlinkEvent__
+#define __javax_swing_event_HyperlinkEvent__
+
+#pragma interface
+
+#include <java/util/EventObject.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace net
+    {
+        class URL;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class HyperlinkEvent;
+          class HyperlinkEvent$EventType;
+      }
+      namespace text
+      {
+          class Element;
+      }
+    }
+  }
+}
+
+class javax::swing::event::HyperlinkEvent : public ::java::util::EventObject
+{
+
+public:
+  HyperlinkEvent(::java::lang::Object *, ::javax::swing::event::HyperlinkEvent$EventType *, ::java::net::URL *);
+  HyperlinkEvent(::java::lang::Object *, ::javax::swing::event::HyperlinkEvent$EventType *, ::java::net::URL *, ::java::lang::String *);
+  HyperlinkEvent(::java::lang::Object *, ::javax::swing::event::HyperlinkEvent$EventType *, ::java::net::URL *, ::java::lang::String *, ::javax::swing::text::Element *);
+  virtual ::javax::swing::text::Element * getSourceElement();
+  virtual ::java::net::URL * getURL();
+  virtual ::javax::swing::event::HyperlinkEvent$EventType * getEventType();
+  virtual ::java::lang::String * getDescription();
+private:
+  static const jlong serialVersionUID = -2054640811732867012LL;
+  ::javax::swing::event::HyperlinkEvent$EventType * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) type;
+  ::java::net::URL * url;
+  ::java::lang::String * description;
+  ::javax::swing::text::Element * element;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_event_HyperlinkEvent__
diff --git a/libjava/javax/swing/event/HyperlinkListener.h b/libjava/javax/swing/event/HyperlinkListener.h
new file mode 100644
index 000000000..ab76042e6
--- /dev/null
+++ b/libjava/javax/swing/event/HyperlinkListener.h
@@ -0,0 +1,33 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_HyperlinkListener__
+#define __javax_swing_event_HyperlinkListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class HyperlinkEvent;
+          class HyperlinkListener;
+      }
+    }
+  }
+}
+
+class javax::swing::event::HyperlinkListener : public ::java::lang::Object
+{
+
+public:
+  virtual void hyperlinkUpdate(::javax::swing::event::HyperlinkEvent *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_event_HyperlinkListener__
diff --git a/libjava/javax/swing/event/InternalFrameAdapter.h b/libjava/javax/swing/event/InternalFrameAdapter.h
new file mode 100644
index 000000000..53aa9ba7a
--- /dev/null
+++ b/libjava/javax/swing/event/InternalFrameAdapter.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_InternalFrameAdapter__
+#define __javax_swing_event_InternalFrameAdapter__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class InternalFrameAdapter;
+          class InternalFrameEvent;
+      }
+    }
+  }
+}
+
+class javax::swing::event::InternalFrameAdapter : public ::java::lang::Object
+{
+
+public:
+  InternalFrameAdapter();
+  virtual void internalFrameActivated(::javax::swing::event::InternalFrameEvent *);
+  virtual void internalFrameClosed(::javax::swing::event::InternalFrameEvent *);
+  virtual void internalFrameClosing(::javax::swing::event::InternalFrameEvent *);
+  virtual void internalFrameDeactivated(::javax::swing::event::InternalFrameEvent *);
+  virtual void internalFrameDeiconified(::javax::swing::event::InternalFrameEvent *);
+  virtual void internalFrameIconified(::javax::swing::event::InternalFrameEvent *);
+  virtual void internalFrameOpened(::javax::swing::event::InternalFrameEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_event_InternalFrameAdapter__
diff --git a/libjava/javax/swing/event/InternalFrameEvent.h b/libjava/javax/swing/event/InternalFrameEvent.h
new file mode 100644
index 000000000..e8ec9e17d
--- /dev/null
+++ b/libjava/javax/swing/event/InternalFrameEvent.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_InternalFrameEvent__
+#define __javax_swing_event_InternalFrameEvent__
+
+#pragma interface
+
+#include <java/awt/AWTEvent.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JInternalFrame;
+      namespace event
+      {
+          class InternalFrameEvent;
+      }
+    }
+  }
+}
+
+class javax::swing::event::InternalFrameEvent : public ::java::awt::AWTEvent
+{
+
+public:
+  InternalFrameEvent(::javax::swing::JInternalFrame *, jint);
+  virtual ::javax::swing::JInternalFrame * getInternalFrame();
+  virtual ::java::lang::String * paramString();
+private:
+  static const jlong serialVersionUID = -5204823611874873183LL;
+public:
+  static const jint INTERNAL_FRAME_ACTIVATED = 25554;
+  static const jint INTERNAL_FRAME_CLOSED = 25551;
+  static const jint INTERNAL_FRAME_CLOSING = 25550;
+  static const jint INTERNAL_FRAME_DEACTIVATED = 25555;
+  static const jint INTERNAL_FRAME_DEICONIFIED = 25553;
+  static const jint INTERNAL_FRAME_FIRST = 25549;
+  static const jint INTERNAL_FRAME_ICONIFIED = 25552;
+  static const jint INTERNAL_FRAME_LAST = 25555;
+  static const jint INTERNAL_FRAME_OPENED = 25549;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_event_InternalFrameEvent__
diff --git a/libjava/javax/swing/event/InternalFrameListener.h b/libjava/javax/swing/event/InternalFrameListener.h
new file mode 100644
index 000000000..03f3e3b8c
--- /dev/null
+++ b/libjava/javax/swing/event/InternalFrameListener.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_InternalFrameListener__
+#define __javax_swing_event_InternalFrameListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class InternalFrameEvent;
+          class InternalFrameListener;
+      }
+    }
+  }
+}
+
+class javax::swing::event::InternalFrameListener : public ::java::lang::Object
+{
+
+public:
+  virtual void internalFrameActivated(::javax::swing::event::InternalFrameEvent *) = 0;
+  virtual void internalFrameClosed(::javax::swing::event::InternalFrameEvent *) = 0;
+  virtual void internalFrameClosing(::javax::swing::event::InternalFrameEvent *) = 0;
+  virtual void internalFrameDeactivated(::javax::swing::event::InternalFrameEvent *) = 0;
+  virtual void internalFrameDeiconified(::javax::swing::event::InternalFrameEvent *) = 0;
+  virtual void internalFrameIconified(::javax::swing::event::InternalFrameEvent *) = 0;
+  virtual void internalFrameOpened(::javax::swing::event::InternalFrameEvent *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_event_InternalFrameListener__
diff --git a/libjava/javax/swing/event/ListDataEvent.h b/libjava/javax/swing/event/ListDataEvent.h
new file mode 100644
index 000000000..35920f22c
--- /dev/null
+++ b/libjava/javax/swing/event/ListDataEvent.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_ListDataEvent__
+#define __javax_swing_event_ListDataEvent__
+
+#pragma interface
+
+#include <java/util/EventObject.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ListDataEvent;
+      }
+    }
+  }
+}
+
+class javax::swing::event::ListDataEvent : public ::java::util::EventObject
+{
+
+public:
+  ListDataEvent(::java::lang::Object *, jint, jint, jint);
+  virtual jint getIndex0();
+  virtual jint getIndex1();
+  virtual jint getType();
+  virtual ::java::lang::String * toString();
+private:
+  static const jlong serialVersionUID = 2510353260071004774LL;
+public:
+  static const jint CONTENTS_CHANGED = 0;
+  static const jint INTERVAL_ADDED = 1;
+  static const jint INTERVAL_REMOVED = 2;
+private:
+  jint __attribute__((aligned(__alignof__( ::java::util::EventObject)))) type;
+  jint index0;
+  jint index1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_event_ListDataEvent__
diff --git a/libjava/javax/swing/event/ListDataListener.h b/libjava/javax/swing/event/ListDataListener.h
new file mode 100644
index 000000000..b00dfb139
--- /dev/null
+++ b/libjava/javax/swing/event/ListDataListener.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_ListDataListener__
+#define __javax_swing_event_ListDataListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ListDataEvent;
+          class ListDataListener;
+      }
+    }
+  }
+}
+
+class javax::swing::event::ListDataListener : public ::java::lang::Object
+{
+
+public:
+  virtual void contentsChanged(::javax::swing::event::ListDataEvent *) = 0;
+  virtual void intervalAdded(::javax::swing::event::ListDataEvent *) = 0;
+  virtual void intervalRemoved(::javax::swing::event::ListDataEvent *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_event_ListDataListener__
diff --git a/libjava/javax/swing/event/ListSelectionEvent.h b/libjava/javax/swing/event/ListSelectionEvent.h
new file mode 100644
index 000000000..b981d49f2
--- /dev/null
+++ b/libjava/javax/swing/event/ListSelectionEvent.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_ListSelectionEvent__
+#define __javax_swing_event_ListSelectionEvent__
+
+#pragma interface
+
+#include <java/util/EventObject.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ListSelectionEvent;
+      }
+    }
+  }
+}
+
+class javax::swing::event::ListSelectionEvent : public ::java::util::EventObject
+{
+
+public:
+  ListSelectionEvent(::java::lang::Object *, jint, jint, jboolean);
+  virtual jint getFirstIndex();
+  virtual jint getLastIndex();
+  virtual jboolean getValueIsAdjusting();
+  virtual ::java::lang::String * toString();
+private:
+  jint __attribute__((aligned(__alignof__( ::java::util::EventObject)))) firstIndex;
+  jint lastIndex;
+  jboolean isAdjusting;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_event_ListSelectionEvent__
diff --git a/libjava/javax/swing/event/ListSelectionListener.h b/libjava/javax/swing/event/ListSelectionListener.h
new file mode 100644
index 000000000..252c9b554
--- /dev/null
+++ b/libjava/javax/swing/event/ListSelectionListener.h
@@ -0,0 +1,33 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_ListSelectionListener__
+#define __javax_swing_event_ListSelectionListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ListSelectionEvent;
+          class ListSelectionListener;
+      }
+    }
+  }
+}
+
+class javax::swing::event::ListSelectionListener : public ::java::lang::Object
+{
+
+public:
+  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_event_ListSelectionListener__
diff --git a/libjava/javax/swing/event/MenuDragMouseEvent.h b/libjava/javax/swing/event/MenuDragMouseEvent.h
new file mode 100644
index 000000000..aa19d3c36
--- /dev/null
+++ b/libjava/javax/swing/event/MenuDragMouseEvent.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_MenuDragMouseEvent__
+#define __javax_swing_event_MenuDragMouseEvent__
+
+#pragma interface
+
+#include <java/awt/event/MouseEvent.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class MenuElement;
+        class MenuSelectionManager;
+      namespace event
+      {
+          class MenuDragMouseEvent;
+      }
+    }
+  }
+}
+
+class javax::swing::event::MenuDragMouseEvent : public ::java::awt::event::MouseEvent
+{
+
+public:
+  MenuDragMouseEvent(::java::awt::Component *, jint, jlong, jint, jint, jint, jint, jboolean, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *);
+  virtual JArray< ::javax::swing::MenuElement * > * getPath();
+  virtual ::javax::swing::MenuSelectionManager * getMenuSelectionManager();
+private:
+  JArray< ::javax::swing::MenuElement * > * __attribute__((aligned(__alignof__( ::java::awt::event::MouseEvent)))) path;
+  ::javax::swing::MenuSelectionManager * manager;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_event_MenuDragMouseEvent__
diff --git a/libjava/javax/swing/event/MenuDragMouseListener.h b/libjava/javax/swing/event/MenuDragMouseListener.h
new file mode 100644
index 000000000..760fe8448
--- /dev/null
+++ b/libjava/javax/swing/event/MenuDragMouseListener.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_MenuDragMouseListener__
+#define __javax_swing_event_MenuDragMouseListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class MenuDragMouseEvent;
+          class MenuDragMouseListener;
+      }
+    }
+  }
+}
+
+class javax::swing::event::MenuDragMouseListener : public ::java::lang::Object
+{
+
+public:
+  virtual void menuDragMouseDragged(::javax::swing::event::MenuDragMouseEvent *) = 0;
+  virtual void menuDragMouseEntered(::javax::swing::event::MenuDragMouseEvent *) = 0;
+  virtual void menuDragMouseExited(::javax::swing::event::MenuDragMouseEvent *) = 0;
+  virtual void menuDragMouseReleased(::javax::swing::event::MenuDragMouseEvent *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_event_MenuDragMouseListener__
diff --git a/libjava/javax/swing/event/MenuEvent.h b/libjava/javax/swing/event/MenuEvent.h
new file mode 100644
index 000000000..988e74059
--- /dev/null
+++ b/libjava/javax/swing/event/MenuEvent.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_MenuEvent__
+#define __javax_swing_event_MenuEvent__
+
+#pragma interface
+
+#include <java/util/EventObject.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class MenuEvent;
+      }
+    }
+  }
+}
+
+class javax::swing::event::MenuEvent : public ::java::util::EventObject
+{
+
+public:
+  MenuEvent(::java::lang::Object *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_event_MenuEvent__
diff --git a/libjava/javax/swing/event/MenuKeyEvent.h b/libjava/javax/swing/event/MenuKeyEvent.h
new file mode 100644
index 000000000..ac61c9869
--- /dev/null
+++ b/libjava/javax/swing/event/MenuKeyEvent.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_MenuKeyEvent__
+#define __javax_swing_event_MenuKeyEvent__
+
+#pragma interface
+
+#include <java/awt/event/KeyEvent.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class MenuElement;
+        class MenuSelectionManager;
+      namespace event
+      {
+          class MenuKeyEvent;
+      }
+    }
+  }
+}
+
+class javax::swing::event::MenuKeyEvent : public ::java::awt::event::KeyEvent
+{
+
+public:
+  MenuKeyEvent(::java::awt::Component *, jint, jlong, jint, jint, jchar, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *);
+  virtual JArray< ::javax::swing::MenuElement * > * getPath();
+  virtual ::javax::swing::MenuSelectionManager * getMenuSelectionManager();
+private:
+  JArray< ::javax::swing::MenuElement * > * __attribute__((aligned(__alignof__( ::java::awt::event::KeyEvent)))) path;
+  ::javax::swing::MenuSelectionManager * manager;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_event_MenuKeyEvent__
diff --git a/libjava/javax/swing/event/MenuKeyListener.h b/libjava/javax/swing/event/MenuKeyListener.h
new file mode 100644
index 000000000..cec8947cd
--- /dev/null
+++ b/libjava/javax/swing/event/MenuKeyListener.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_MenuKeyListener__
+#define __javax_swing_event_MenuKeyListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class MenuKeyEvent;
+          class MenuKeyListener;
+      }
+    }
+  }
+}
+
+class javax::swing::event::MenuKeyListener : public ::java::lang::Object
+{
+
+public:
+  virtual void menuKeyPressed(::javax::swing::event::MenuKeyEvent *) = 0;
+  virtual void menuKeyReleased(::javax::swing::event::MenuKeyEvent *) = 0;
+  virtual void menuKeyTyped(::javax::swing::event::MenuKeyEvent *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_event_MenuKeyListener__
diff --git a/libjava/javax/swing/event/MenuListener.h b/libjava/javax/swing/event/MenuListener.h
new file mode 100644
index 000000000..356a633bc
--- /dev/null
+++ b/libjava/javax/swing/event/MenuListener.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_MenuListener__
+#define __javax_swing_event_MenuListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class MenuEvent;
+          class MenuListener;
+      }
+    }
+  }
+}
+
+class javax::swing::event::MenuListener : public ::java::lang::Object
+{
+
+public:
+  virtual void menuCanceled(::javax::swing::event::MenuEvent *) = 0;
+  virtual void menuDeselected(::javax::swing::event::MenuEvent *) = 0;
+  virtual void menuSelected(::javax::swing::event::MenuEvent *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_event_MenuListener__
diff --git a/libjava/javax/swing/event/MouseInputAdapter.h b/libjava/javax/swing/event/MouseInputAdapter.h
new file mode 100644
index 000000000..05e758985
--- /dev/null
+++ b/libjava/javax/swing/event/MouseInputAdapter.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_MouseInputAdapter__
+#define __javax_swing_event_MouseInputAdapter__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class MouseInputAdapter;
+      }
+    }
+  }
+}
+
+class javax::swing::event::MouseInputAdapter : public ::java::lang::Object
+{
+
+public:
+  MouseInputAdapter();
+  virtual void mouseClicked(::java::awt::event::MouseEvent *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+  virtual void mouseEntered(::java::awt::event::MouseEvent *);
+  virtual void mouseExited(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_event_MouseInputAdapter__
diff --git a/libjava/javax/swing/event/MouseInputListener.h b/libjava/javax/swing/event/MouseInputListener.h
new file mode 100644
index 000000000..10deab465
--- /dev/null
+++ b/libjava/javax/swing/event/MouseInputListener.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_MouseInputListener__
+#define __javax_swing_event_MouseInputListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class MouseInputListener;
+      }
+    }
+  }
+}
+
+class javax::swing::event::MouseInputListener : public ::java::lang::Object
+{
+
+public:
+  virtual void mouseClicked(::java::awt::event::MouseEvent *) = 0;
+  virtual void mousePressed(::java::awt::event::MouseEvent *) = 0;
+  virtual void mouseReleased(::java::awt::event::MouseEvent *) = 0;
+  virtual void mouseEntered(::java::awt::event::MouseEvent *) = 0;
+  virtual void mouseExited(::java::awt::event::MouseEvent *) = 0;
+  virtual void mouseDragged(::java::awt::event::MouseEvent *) = 0;
+  virtual void mouseMoved(::java::awt::event::MouseEvent *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_event_MouseInputListener__
diff --git a/libjava/javax/swing/event/PopupMenuEvent.h b/libjava/javax/swing/event/PopupMenuEvent.h
new file mode 100644
index 000000000..4292f10c6
--- /dev/null
+++ b/libjava/javax/swing/event/PopupMenuEvent.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_PopupMenuEvent__
+#define __javax_swing_event_PopupMenuEvent__
+
+#pragma interface
+
+#include <java/util/EventObject.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class PopupMenuEvent;
+      }
+    }
+  }
+}
+
+class javax::swing::event::PopupMenuEvent : public ::java::util::EventObject
+{
+
+public:
+  PopupMenuEvent(::java::lang::Object *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_event_PopupMenuEvent__
diff --git a/libjava/javax/swing/event/PopupMenuListener.h b/libjava/javax/swing/event/PopupMenuListener.h
new file mode 100644
index 000000000..8446bc3a2
--- /dev/null
+++ b/libjava/javax/swing/event/PopupMenuListener.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_PopupMenuListener__
+#define __javax_swing_event_PopupMenuListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class PopupMenuEvent;
+          class PopupMenuListener;
+      }
+    }
+  }
+}
+
+class javax::swing::event::PopupMenuListener : public ::java::lang::Object
+{
+
+public:
+  virtual void popupMenuCanceled(::javax::swing::event::PopupMenuEvent *) = 0;
+  virtual void popupMenuWillBecomeInvisible(::javax::swing::event::PopupMenuEvent *) = 0;
+  virtual void popupMenuWillBecomeVisible(::javax::swing::event::PopupMenuEvent *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_event_PopupMenuListener__
diff --git a/libjava/javax/swing/event/SwingPropertyChangeSupport.h b/libjava/javax/swing/event/SwingPropertyChangeSupport.h
new file mode 100644
index 000000000..7d997085c
--- /dev/null
+++ b/libjava/javax/swing/event/SwingPropertyChangeSupport.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_SwingPropertyChangeSupport__
+#define __javax_swing_event_SwingPropertyChangeSupport__
+
+#pragma interface
+
+#include <java/beans/PropertyChangeSupport.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class SwingPropertyChangeSupport;
+      }
+    }
+  }
+}
+
+class javax::swing::event::SwingPropertyChangeSupport : public ::java::beans::PropertyChangeSupport
+{
+
+public:
+  SwingPropertyChangeSupport(::java::lang::Object *);
+private:
+  static const jlong serialVersionUID = 7162625831330845068LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_event_SwingPropertyChangeSupport__
diff --git a/libjava/javax/swing/event/TableColumnModelEvent.h b/libjava/javax/swing/event/TableColumnModelEvent.h
new file mode 100644
index 000000000..0de5a8f51
--- /dev/null
+++ b/libjava/javax/swing/event/TableColumnModelEvent.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_TableColumnModelEvent__
+#define __javax_swing_event_TableColumnModelEvent__
+
+#pragma interface
+
+#include <java/util/EventObject.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class TableColumnModelEvent;
+      }
+      namespace table
+      {
+          class TableColumnModel;
+      }
+    }
+  }
+}
+
+class javax::swing::event::TableColumnModelEvent : public ::java::util::EventObject
+{
+
+public:
+  TableColumnModelEvent(::javax::swing::table::TableColumnModel *, jint, jint);
+  virtual jint getFromIndex();
+  virtual jint getToIndex();
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::java::util::EventObject)))) fromIndex;
+  jint toIndex;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_event_TableColumnModelEvent__
diff --git a/libjava/javax/swing/event/TableColumnModelListener.h b/libjava/javax/swing/event/TableColumnModelListener.h
new file mode 100644
index 000000000..3712b2e27
--- /dev/null
+++ b/libjava/javax/swing/event/TableColumnModelListener.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_TableColumnModelListener__
+#define __javax_swing_event_TableColumnModelListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ChangeEvent;
+          class ListSelectionEvent;
+          class TableColumnModelEvent;
+          class TableColumnModelListener;
+      }
+    }
+  }
+}
+
+class javax::swing::event::TableColumnModelListener : public ::java::lang::Object
+{
+
+public:
+  virtual void columnAdded(::javax::swing::event::TableColumnModelEvent *) = 0;
+  virtual void columnMarginChanged(::javax::swing::event::ChangeEvent *) = 0;
+  virtual void columnMoved(::javax::swing::event::TableColumnModelEvent *) = 0;
+  virtual void columnRemoved(::javax::swing::event::TableColumnModelEvent *) = 0;
+  virtual void columnSelectionChanged(::javax::swing::event::ListSelectionEvent *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_event_TableColumnModelListener__
diff --git a/libjava/javax/swing/event/TableModelEvent.h b/libjava/javax/swing/event/TableModelEvent.h
new file mode 100644
index 000000000..dff48f5eb
--- /dev/null
+++ b/libjava/javax/swing/event/TableModelEvent.h
@@ -0,0 +1,58 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_TableModelEvent__
+#define __javax_swing_event_TableModelEvent__
+
+#pragma interface
+
+#include <java/util/EventObject.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class TableModelEvent;
+      }
+      namespace table
+      {
+          class TableModel;
+      }
+    }
+  }
+}
+
+class javax::swing::event::TableModelEvent : public ::java::util::EventObject
+{
+
+public:
+  TableModelEvent(::javax::swing::table::TableModel *);
+  TableModelEvent(::javax::swing::table::TableModel *, jint);
+  TableModelEvent(::javax::swing::table::TableModel *, jint, jint);
+  TableModelEvent(::javax::swing::table::TableModel *, jint, jint, jint);
+  TableModelEvent(::javax::swing::table::TableModel *, jint, jint, jint, jint);
+  virtual jint getColumn();
+  virtual jint getFirstRow();
+  virtual jint getLastRow();
+  virtual jint getType();
+private:
+  static const jlong serialVersionUID = -7849342674552212824LL;
+public:
+  static const jint ALL_COLUMNS = -1;
+  static const jint DELETE = -1;
+  static const jint HEADER_ROW = -1;
+  static const jint INSERT = 1;
+  static const jint UPDATE = 0;
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::java::util::EventObject)))) column;
+  jint firstRow;
+  jint lastRow;
+  jint type;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_event_TableModelEvent__
diff --git a/libjava/javax/swing/event/TableModelListener.h b/libjava/javax/swing/event/TableModelListener.h
new file mode 100644
index 000000000..db47af49f
--- /dev/null
+++ b/libjava/javax/swing/event/TableModelListener.h
@@ -0,0 +1,33 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_TableModelListener__
+#define __javax_swing_event_TableModelListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class TableModelEvent;
+          class TableModelListener;
+      }
+    }
+  }
+}
+
+class javax::swing::event::TableModelListener : public ::java::lang::Object
+{
+
+public:
+  virtual void tableChanged(::javax::swing::event::TableModelEvent *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_event_TableModelListener__
diff --git a/libjava/javax/swing/event/TreeExpansionEvent.h b/libjava/javax/swing/event/TreeExpansionEvent.h
new file mode 100644
index 000000000..8694a2b33
--- /dev/null
+++ b/libjava/javax/swing/event/TreeExpansionEvent.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_TreeExpansionEvent__
+#define __javax_swing_event_TreeExpansionEvent__
+
+#pragma interface
+
+#include <java/util/EventObject.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class TreeExpansionEvent;
+      }
+      namespace tree
+      {
+          class TreePath;
+      }
+    }
+  }
+}
+
+class javax::swing::event::TreeExpansionEvent : public ::java::util::EventObject
+{
+
+public:
+  TreeExpansionEvent(::java::lang::Object *, ::javax::swing::tree::TreePath *);
+  virtual ::javax::swing::tree::TreePath * getPath();
+public: // actually protected
+  ::javax::swing::tree::TreePath * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) path;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_event_TreeExpansionEvent__
diff --git a/libjava/javax/swing/event/TreeExpansionListener.h b/libjava/javax/swing/event/TreeExpansionListener.h
new file mode 100644
index 000000000..86960dbcc
--- /dev/null
+++ b/libjava/javax/swing/event/TreeExpansionListener.h
@@ -0,0 +1,34 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_TreeExpansionListener__
+#define __javax_swing_event_TreeExpansionListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class TreeExpansionEvent;
+          class TreeExpansionListener;
+      }
+    }
+  }
+}
+
+class javax::swing::event::TreeExpansionListener : public ::java::lang::Object
+{
+
+public:
+  virtual void treeCollapsed(::javax::swing::event::TreeExpansionEvent *) = 0;
+  virtual void treeExpanded(::javax::swing::event::TreeExpansionEvent *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_event_TreeExpansionListener__
diff --git a/libjava/javax/swing/event/TreeModelEvent.h b/libjava/javax/swing/event/TreeModelEvent.h
new file mode 100644
index 000000000..857ebf532
--- /dev/null
+++ b/libjava/javax/swing/event/TreeModelEvent.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_TreeModelEvent__
+#define __javax_swing_event_TreeModelEvent__
+
+#pragma interface
+
+#include <java/util/EventObject.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class TreeModelEvent;
+      }
+      namespace tree
+      {
+          class TreePath;
+      }
+    }
+  }
+}
+
+class javax::swing::event::TreeModelEvent : public ::java::util::EventObject
+{
+
+public:
+  TreeModelEvent(::java::lang::Object *, JArray< ::java::lang::Object * > *);
+  TreeModelEvent(::java::lang::Object *, JArray< ::java::lang::Object * > *, JArray< jint > *, JArray< ::java::lang::Object * > *);
+  TreeModelEvent(::java::lang::Object *, ::javax::swing::tree::TreePath *);
+  TreeModelEvent(::java::lang::Object *, ::javax::swing::tree::TreePath *, JArray< jint > *, JArray< ::java::lang::Object * > *);
+  virtual JArray< jint > * getChildIndices();
+  virtual JArray< ::java::lang::Object * > * getChildren();
+  virtual JArray< ::java::lang::Object * > * getPath();
+  virtual ::javax::swing::tree::TreePath * getTreePath();
+  virtual ::java::lang::String * toString();
+public: // actually protected
+  JArray< jint > * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) childIndices;
+  JArray< ::java::lang::Object * > * children;
+  ::javax::swing::tree::TreePath * path;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_event_TreeModelEvent__
diff --git a/libjava/javax/swing/event/TreeModelListener.h b/libjava/javax/swing/event/TreeModelListener.h
new file mode 100644
index 000000000..cde0849de
--- /dev/null
+++ b/libjava/javax/swing/event/TreeModelListener.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_TreeModelListener__
+#define __javax_swing_event_TreeModelListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class TreeModelEvent;
+          class TreeModelListener;
+      }
+    }
+  }
+}
+
+class javax::swing::event::TreeModelListener : public ::java::lang::Object
+{
+
+public:
+  virtual void treeNodesChanged(::javax::swing::event::TreeModelEvent *) = 0;
+  virtual void treeNodesInserted(::javax::swing::event::TreeModelEvent *) = 0;
+  virtual void treeNodesRemoved(::javax::swing::event::TreeModelEvent *) = 0;
+  virtual void treeStructureChanged(::javax::swing::event::TreeModelEvent *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_event_TreeModelListener__
diff --git a/libjava/javax/swing/event/TreeSelectionEvent.h b/libjava/javax/swing/event/TreeSelectionEvent.h
new file mode 100644
index 000000000..82bdfd61d
--- /dev/null
+++ b/libjava/javax/swing/event/TreeSelectionEvent.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_TreeSelectionEvent__
+#define __javax_swing_event_TreeSelectionEvent__
+
+#pragma interface
+
+#include <java/util/EventObject.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class TreeSelectionEvent;
+      }
+      namespace tree
+      {
+          class TreePath;
+      }
+    }
+  }
+}
+
+class javax::swing::event::TreeSelectionEvent : public ::java::util::EventObject
+{
+
+public:
+  TreeSelectionEvent(::java::lang::Object *, JArray< ::javax::swing::tree::TreePath * > *, JArray< jboolean > *, ::javax::swing::tree::TreePath *, ::javax::swing::tree::TreePath *);
+  TreeSelectionEvent(::java::lang::Object *, ::javax::swing::tree::TreePath *, jboolean, ::javax::swing::tree::TreePath *, ::javax::swing::tree::TreePath *);
+  virtual ::javax::swing::tree::TreePath * getPath();
+  virtual JArray< ::javax::swing::tree::TreePath * > * getPaths();
+  virtual jboolean isAddedPath();
+  virtual jboolean isAddedPath(::javax::swing::tree::TreePath *);
+  virtual jboolean isAddedPath(jint);
+  virtual ::javax::swing::tree::TreePath * getOldLeadSelectionPath();
+  virtual ::javax::swing::tree::TreePath * getNewLeadSelectionPath();
+  virtual ::java::lang::Object * cloneWithSource(::java::lang::Object *);
+public: // actually protected
+  JArray< ::javax::swing::tree::TreePath * > * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) paths;
+  JArray< jboolean > * areNew;
+  ::javax::swing::tree::TreePath * oldLeadSelectionPath;
+  ::javax::swing::tree::TreePath * newLeadSelectionPath;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_event_TreeSelectionEvent__
diff --git a/libjava/javax/swing/event/TreeSelectionListener.h b/libjava/javax/swing/event/TreeSelectionListener.h
new file mode 100644
index 000000000..121f05f88
--- /dev/null
+++ b/libjava/javax/swing/event/TreeSelectionListener.h
@@ -0,0 +1,33 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_TreeSelectionListener__
+#define __javax_swing_event_TreeSelectionListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class TreeSelectionEvent;
+          class TreeSelectionListener;
+      }
+    }
+  }
+}
+
+class javax::swing::event::TreeSelectionListener : public ::java::lang::Object
+{
+
+public:
+  virtual void valueChanged(::javax::swing::event::TreeSelectionEvent *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_event_TreeSelectionListener__
diff --git a/libjava/javax/swing/event/TreeWillExpandListener.h b/libjava/javax/swing/event/TreeWillExpandListener.h
new file mode 100644
index 000000000..fea233e55
--- /dev/null
+++ b/libjava/javax/swing/event/TreeWillExpandListener.h
@@ -0,0 +1,34 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_TreeWillExpandListener__
+#define __javax_swing_event_TreeWillExpandListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class TreeExpansionEvent;
+          class TreeWillExpandListener;
+      }
+    }
+  }
+}
+
+class javax::swing::event::TreeWillExpandListener : public ::java::lang::Object
+{
+
+public:
+  virtual void treeWillCollapse(::javax::swing::event::TreeExpansionEvent *) = 0;
+  virtual void treeWillExpand(::javax::swing::event::TreeExpansionEvent *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_event_TreeWillExpandListener__
diff --git a/libjava/javax/swing/event/UndoableEditEvent.h b/libjava/javax/swing/event/UndoableEditEvent.h
new file mode 100644
index 000000000..244795301
--- /dev/null
+++ b/libjava/javax/swing/event/UndoableEditEvent.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_UndoableEditEvent__
+#define __javax_swing_event_UndoableEditEvent__
+
+#pragma interface
+
+#include <java/util/EventObject.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class UndoableEditEvent;
+      }
+      namespace undo
+      {
+          class UndoableEdit;
+      }
+    }
+  }
+}
+
+class javax::swing::event::UndoableEditEvent : public ::java::util::EventObject
+{
+
+public:
+  UndoableEditEvent(::java::lang::Object *, ::javax::swing::undo::UndoableEdit *);
+  virtual ::javax::swing::undo::UndoableEdit * getEdit();
+private:
+  static const jlong serialVersionUID = 4418044561759134484LL;
+  ::javax::swing::undo::UndoableEdit * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) edit;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_event_UndoableEditEvent__
diff --git a/libjava/javax/swing/event/UndoableEditListener.h b/libjava/javax/swing/event/UndoableEditListener.h
new file mode 100644
index 000000000..738c5329a
--- /dev/null
+++ b/libjava/javax/swing/event/UndoableEditListener.h
@@ -0,0 +1,33 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_event_UndoableEditListener__
+#define __javax_swing_event_UndoableEditListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class UndoableEditEvent;
+          class UndoableEditListener;
+      }
+    }
+  }
+}
+
+class javax::swing::event::UndoableEditListener : public ::java::lang::Object
+{
+
+public:
+  virtual void undoableEditHappened(::javax::swing::event::UndoableEditEvent *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_event_UndoableEditListener__
diff --git a/libjava/javax/swing/filechooser/FileFilter.h b/libjava/javax/swing/filechooser/FileFilter.h
new file mode 100644
index 000000000..ce2d75e74
--- /dev/null
+++ b/libjava/javax/swing/filechooser/FileFilter.h
@@ -0,0 +1,34 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_filechooser_FileFilter__
+#define __javax_swing_filechooser_FileFilter__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace filechooser
+      {
+          class FileFilter;
+      }
+    }
+  }
+}
+
+class javax::swing::filechooser::FileFilter : public ::java::lang::Object
+{
+
+public:
+  FileFilter();
+  virtual jboolean accept(::java::io::File *) = 0;
+  virtual ::java::lang::String * getDescription() = 0;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_filechooser_FileFilter__
diff --git a/libjava/javax/swing/filechooser/FileSystemView.h b/libjava/javax/swing/filechooser/FileSystemView.h
new file mode 100644
index 000000000..48b35954c
--- /dev/null
+++ b/libjava/javax/swing/filechooser/FileSystemView.h
@@ -0,0 +1,63 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_filechooser_FileSystemView__
+#define __javax_swing_filechooser_FileSystemView__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+      namespace filechooser
+      {
+          class FileSystemView;
+      }
+    }
+  }
+}
+
+class javax::swing::filechooser::FileSystemView : public ::java::lang::Object
+{
+
+public:
+  FileSystemView();
+  virtual ::java::io::File * createFileObject(::java::io::File *, ::java::lang::String *);
+  virtual ::java::io::File * createFileObject(::java::lang::String *);
+public: // actually protected
+  virtual ::java::io::File * createFileSystemRoot(::java::io::File *);
+public:
+  virtual ::java::io::File * createNewFolder(::java::io::File *) = 0;
+  virtual ::java::io::File * getChild(::java::io::File *, ::java::lang::String *);
+  virtual ::java::io::File * getDefaultDirectory();
+  virtual JArray< ::java::io::File * > * getFiles(::java::io::File *, jboolean);
+  static ::javax::swing::filechooser::FileSystemView * getFileSystemView();
+  virtual ::java::io::File * getHomeDirectory();
+  virtual ::java::io::File * getParentDirectory(::java::io::File *);
+  virtual JArray< ::java::io::File * > * getRoots();
+  virtual ::java::lang::String * getSystemDisplayName(::java::io::File *);
+  virtual ::javax::swing::Icon * getSystemIcon(::java::io::File *);
+  virtual ::java::lang::String * getSystemTypeDescription(::java::io::File *);
+  virtual jboolean isComputerNode(::java::io::File *);
+  virtual jboolean isDrive(::java::io::File *);
+  virtual jboolean isFileSystem(::java::io::File *);
+  virtual jboolean isFileSystemRoot(::java::io::File *);
+  virtual jboolean isFloppyDrive(::java::io::File *);
+  virtual jboolean isHiddenFile(::java::io::File *);
+  virtual jboolean isParent(::java::io::File *, ::java::io::File *);
+  virtual jboolean isRoot(::java::io::File *);
+  virtual ::java::lang::Boolean * isTraversable(::java::io::File *);
+private:
+  static ::javax::swing::filechooser::FileSystemView * defaultFileSystemView;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_filechooser_FileSystemView__
diff --git a/libjava/javax/swing/filechooser/FileView.h b/libjava/javax/swing/filechooser/FileView.h
new file mode 100644
index 000000000..dffaa0f2b
--- /dev/null
+++ b/libjava/javax/swing/filechooser/FileView.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_filechooser_FileView__
+#define __javax_swing_filechooser_FileView__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+      namespace filechooser
+      {
+          class FileView;
+      }
+    }
+  }
+}
+
+class javax::swing::filechooser::FileView : public ::java::lang::Object
+{
+
+public:
+  FileView();
+  virtual ::java::lang::String * getName(::java::io::File *);
+  virtual ::java::lang::String * getDescription(::java::io::File *);
+  virtual ::java::lang::String * getTypeDescription(::java::io::File *);
+  virtual ::javax::swing::Icon * getIcon(::java::io::File *);
+  virtual ::java::lang::Boolean * isTraversable(::java::io::File *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_filechooser_FileView__
diff --git a/libjava/javax/swing/filechooser/UnixFileSystemView.h b/libjava/javax/swing/filechooser/UnixFileSystemView.h
new file mode 100644
index 000000000..e06f9b8f0
--- /dev/null
+++ b/libjava/javax/swing/filechooser/UnixFileSystemView.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_filechooser_UnixFileSystemView__
+#define __javax_swing_filechooser_UnixFileSystemView__
+
+#pragma interface
+
+#include <javax/swing/filechooser/FileSystemView.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+      namespace filechooser
+      {
+          class UnixFileSystemView;
+      }
+    }
+  }
+}
+
+class javax::swing::filechooser::UnixFileSystemView : public ::javax::swing::filechooser::FileSystemView
+{
+
+public: // actually package-private
+  UnixFileSystemView();
+public:
+  virtual ::java::io::File * createNewFolder(::java::io::File *);
+  virtual JArray< ::java::io::File * > * getRoots();
+  virtual ::java::lang::String * getSystemDisplayName(::java::io::File *);
+  virtual ::javax::swing::Icon * getSystemIcon(::java::io::File *);
+  virtual ::java::lang::String * getSystemTypeDescription(::java::io::File *);
+  virtual jboolean isRoot(::java::io::File *);
+private:
+  static ::java::lang::String * NEW_FOLDER_NAME;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_filechooser_UnixFileSystemView__
diff --git a/libjava/javax/swing/plaf/ActionMapUIResource.h b/libjava/javax/swing/plaf/ActionMapUIResource.h
new file mode 100644
index 000000000..a9364d8e2
--- /dev/null
+++ b/libjava/javax/swing/plaf/ActionMapUIResource.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_ActionMapUIResource__
+#define __javax_swing_plaf_ActionMapUIResource__
+
+#pragma interface
+
+#include <javax/swing/ActionMap.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class ActionMapUIResource;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::ActionMapUIResource : public ::javax::swing::ActionMap
+{
+
+public:
+  ActionMapUIResource();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_ActionMapUIResource__
diff --git a/libjava/javax/swing/plaf/BorderUIResource$BevelBorderUIResource.h b/libjava/javax/swing/plaf/BorderUIResource$BevelBorderUIResource.h
new file mode 100644
index 000000000..c85a1ba6e
--- /dev/null
+++ b/libjava/javax/swing/plaf/BorderUIResource$BevelBorderUIResource.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_BorderUIResource$BevelBorderUIResource__
+#define __javax_swing_plaf_BorderUIResource$BevelBorderUIResource__
+
+#pragma interface
+
+#include <javax/swing/border/BevelBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class BorderUIResource$BevelBorderUIResource;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::BorderUIResource$BevelBorderUIResource : public ::javax::swing::border::BevelBorder
+{
+
+public:
+  BorderUIResource$BevelBorderUIResource(jint);
+  BorderUIResource$BevelBorderUIResource(jint, ::java::awt::Color *, ::java::awt::Color *);
+  BorderUIResource$BevelBorderUIResource(jint, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
+private:
+  static const jlong serialVersionUID = -1275542891108351642LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_BorderUIResource$BevelBorderUIResource__
diff --git a/libjava/javax/swing/plaf/BorderUIResource$CompoundBorderUIResource.h b/libjava/javax/swing/plaf/BorderUIResource$CompoundBorderUIResource.h
new file mode 100644
index 000000000..8161ecbe9
--- /dev/null
+++ b/libjava/javax/swing/plaf/BorderUIResource$CompoundBorderUIResource.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_BorderUIResource$CompoundBorderUIResource__
+#define __javax_swing_plaf_BorderUIResource$CompoundBorderUIResource__
+
+#pragma interface
+
+#include <javax/swing/border/CompoundBorder.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace border
+      {
+          class Border;
+      }
+      namespace plaf
+      {
+          class BorderUIResource$CompoundBorderUIResource;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::BorderUIResource$CompoundBorderUIResource : public ::javax::swing::border::CompoundBorder
+{
+
+public:
+  BorderUIResource$CompoundBorderUIResource(::javax::swing::border::Border *, ::javax::swing::border::Border *);
+private:
+  static const jlong serialVersionUID = 7550017084975167341LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_BorderUIResource$CompoundBorderUIResource__
diff --git a/libjava/javax/swing/plaf/BorderUIResource$EmptyBorderUIResource.h b/libjava/javax/swing/plaf/BorderUIResource$EmptyBorderUIResource.h
new file mode 100644
index 000000000..15ba53fae
--- /dev/null
+++ b/libjava/javax/swing/plaf/BorderUIResource$EmptyBorderUIResource.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_BorderUIResource$EmptyBorderUIResource__
+#define __javax_swing_plaf_BorderUIResource$EmptyBorderUIResource__
+
+#pragma interface
+
+#include <javax/swing/border/EmptyBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class BorderUIResource$EmptyBorderUIResource;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::BorderUIResource$EmptyBorderUIResource : public ::javax::swing::border::EmptyBorder
+{
+
+public:
+  BorderUIResource$EmptyBorderUIResource(jint, jint, jint, jint);
+  BorderUIResource$EmptyBorderUIResource(::java::awt::Insets *);
+private:
+  static const jlong serialVersionUID = -4914187529340071708LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_BorderUIResource$EmptyBorderUIResource__
diff --git a/libjava/javax/swing/plaf/BorderUIResource$EtchedBorderUIResource.h b/libjava/javax/swing/plaf/BorderUIResource$EtchedBorderUIResource.h
new file mode 100644
index 000000000..89934717a
--- /dev/null
+++ b/libjava/javax/swing/plaf/BorderUIResource$EtchedBorderUIResource.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_BorderUIResource$EtchedBorderUIResource__
+#define __javax_swing_plaf_BorderUIResource$EtchedBorderUIResource__
+
+#pragma interface
+
+#include <javax/swing/border/EtchedBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class BorderUIResource$EtchedBorderUIResource;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::BorderUIResource$EtchedBorderUIResource : public ::javax::swing::border::EtchedBorder
+{
+
+public:
+  BorderUIResource$EtchedBorderUIResource();
+  BorderUIResource$EtchedBorderUIResource(jint);
+  BorderUIResource$EtchedBorderUIResource(::java::awt::Color *, ::java::awt::Color *);
+  BorderUIResource$EtchedBorderUIResource(jint, ::java::awt::Color *, ::java::awt::Color *);
+private:
+  static const jlong serialVersionUID = -8186391754165296656LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_BorderUIResource$EtchedBorderUIResource__
diff --git a/libjava/javax/swing/plaf/BorderUIResource$LineBorderUIResource.h b/libjava/javax/swing/plaf/BorderUIResource$LineBorderUIResource.h
new file mode 100644
index 000000000..fe3669c00
--- /dev/null
+++ b/libjava/javax/swing/plaf/BorderUIResource$LineBorderUIResource.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_BorderUIResource$LineBorderUIResource__
+#define __javax_swing_plaf_BorderUIResource$LineBorderUIResource__
+
+#pragma interface
+
+#include <javax/swing/border/LineBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class BorderUIResource$LineBorderUIResource;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::BorderUIResource$LineBorderUIResource : public ::javax::swing::border::LineBorder
+{
+
+public:
+  BorderUIResource$LineBorderUIResource(::java::awt::Color *);
+  BorderUIResource$LineBorderUIResource(::java::awt::Color *, jint);
+private:
+  static const jlong serialVersionUID = -6171232338180172310LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_BorderUIResource$LineBorderUIResource__
diff --git a/libjava/javax/swing/plaf/BorderUIResource$MatteBorderUIResource.h b/libjava/javax/swing/plaf/BorderUIResource$MatteBorderUIResource.h
new file mode 100644
index 000000000..b5925fce7
--- /dev/null
+++ b/libjava/javax/swing/plaf/BorderUIResource$MatteBorderUIResource.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_BorderUIResource$MatteBorderUIResource__
+#define __javax_swing_plaf_BorderUIResource$MatteBorderUIResource__
+
+#pragma interface
+
+#include <javax/swing/border/MatteBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+      namespace plaf
+      {
+          class BorderUIResource$MatteBorderUIResource;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::BorderUIResource$MatteBorderUIResource : public ::javax::swing::border::MatteBorder
+{
+
+public:
+  BorderUIResource$MatteBorderUIResource(jint, jint, jint, jint, ::java::awt::Color *);
+  BorderUIResource$MatteBorderUIResource(jint, jint, jint, jint, ::javax::swing::Icon *);
+  BorderUIResource$MatteBorderUIResource(::javax::swing::Icon *);
+private:
+  static const jlong serialVersionUID = -8107923147541851122LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_BorderUIResource$MatteBorderUIResource__
diff --git a/libjava/javax/swing/plaf/BorderUIResource$TitledBorderUIResource.h b/libjava/javax/swing/plaf/BorderUIResource$TitledBorderUIResource.h
new file mode 100644
index 000000000..a20193f6d
--- /dev/null
+++ b/libjava/javax/swing/plaf/BorderUIResource$TitledBorderUIResource.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_BorderUIResource$TitledBorderUIResource__
+#define __javax_swing_plaf_BorderUIResource$TitledBorderUIResource__
+
+#pragma interface
+
+#include <javax/swing/border/TitledBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Font;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace border
+      {
+          class Border;
+      }
+      namespace plaf
+      {
+          class BorderUIResource$TitledBorderUIResource;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::BorderUIResource$TitledBorderUIResource : public ::javax::swing::border::TitledBorder
+{
+
+public:
+  BorderUIResource$TitledBorderUIResource(::java::lang::String *);
+  BorderUIResource$TitledBorderUIResource(::javax::swing::border::Border *);
+  BorderUIResource$TitledBorderUIResource(::javax::swing::border::Border *, ::java::lang::String *);
+  BorderUIResource$TitledBorderUIResource(::javax::swing::border::Border *, ::java::lang::String *, jint, jint);
+  BorderUIResource$TitledBorderUIResource(::javax::swing::border::Border *, ::java::lang::String *, jint, jint, ::java::awt::Font *);
+  BorderUIResource$TitledBorderUIResource(::javax::swing::border::Border *, ::java::lang::String *, jint, jint, ::java::awt::Font *, ::java::awt::Color *);
+private:
+  static const jlong serialVersionUID = 7667113547406407427LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_BorderUIResource$TitledBorderUIResource__
diff --git a/libjava/javax/swing/plaf/BorderUIResource.h b/libjava/javax/swing/plaf/BorderUIResource.h
new file mode 100644
index 000000000..3a89c2c00
--- /dev/null
+++ b/libjava/javax/swing/plaf/BorderUIResource.h
@@ -0,0 +1,61 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_BorderUIResource__
+#define __javax_swing_plaf_BorderUIResource__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace border
+      {
+          class Border;
+      }
+      namespace plaf
+      {
+          class BorderUIResource;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::BorderUIResource : public ::java::lang::Object
+{
+
+public:
+  static ::javax::swing::border::Border * getEtchedBorderUIResource();
+  static ::javax::swing::border::Border * getLoweredBevelBorderUIResource();
+  static ::javax::swing::border::Border * getRaisedBevelBorderUIResource();
+  static ::javax::swing::border::Border * getBlackLineBorderUIResource();
+  BorderUIResource(::javax::swing::border::Border *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual jboolean isBorderOpaque();
+public: // actually package-private
+  static const jlong serialVersionUID = -3440553684010079691LL;
+private:
+  static ::javax::swing::border::Border * etchedBorderUIResource;
+  static ::javax::swing::border::Border * loweredBevelBorderUIResource;
+  static ::javax::swing::border::Border * raisedBevelBorderUIResource;
+  static ::javax::swing::border::Border * blackLineBorderUIResource;
+  ::javax::swing::border::Border * __attribute__((aligned(__alignof__( ::java::lang::Object)))) delegate;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_BorderUIResource__
diff --git a/libjava/javax/swing/plaf/ButtonUI.h b/libjava/javax/swing/plaf/ButtonUI.h
new file mode 100644
index 000000000..61cb852b8
--- /dev/null
+++ b/libjava/javax/swing/plaf/ButtonUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_ButtonUI__
+#define __javax_swing_plaf_ButtonUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class ButtonUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::ButtonUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  ButtonUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_ButtonUI__
diff --git a/libjava/javax/swing/plaf/ColorChooserUI.h b/libjava/javax/swing/plaf/ColorChooserUI.h
new file mode 100644
index 000000000..9db0d0e89
--- /dev/null
+++ b/libjava/javax/swing/plaf/ColorChooserUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_ColorChooserUI__
+#define __javax_swing_plaf_ColorChooserUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class ColorChooserUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::ColorChooserUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  ColorChooserUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_ColorChooserUI__
diff --git a/libjava/javax/swing/plaf/ColorUIResource.h b/libjava/javax/swing/plaf/ColorUIResource.h
new file mode 100644
index 000000000..37ef22382
--- /dev/null
+++ b/libjava/javax/swing/plaf/ColorUIResource.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_ColorUIResource__
+#define __javax_swing_plaf_ColorUIResource__
+
+#pragma interface
+
+#include <java/awt/Color.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class ColorUIResource;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::ColorUIResource : public ::java::awt::Color
+{
+
+public:
+  ColorUIResource(jint, jint, jint);
+  ColorUIResource(jint);
+  ColorUIResource(jfloat, jfloat, jfloat);
+  ColorUIResource(::java::awt::Color *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_ColorUIResource__
diff --git a/libjava/javax/swing/plaf/ComboBoxUI.h b/libjava/javax/swing/plaf/ComboBoxUI.h
new file mode 100644
index 000000000..bdcdfe3f0
--- /dev/null
+++ b/libjava/javax/swing/plaf/ComboBoxUI.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_ComboBoxUI__
+#define __javax_swing_plaf_ComboBoxUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComboBox;
+      namespace plaf
+      {
+          class ComboBoxUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::ComboBoxUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  ComboBoxUI();
+  virtual void setPopupVisible(::javax::swing::JComboBox *, jboolean) = 0;
+  virtual jboolean isPopupVisible(::javax::swing::JComboBox *) = 0;
+  virtual jboolean isFocusTraversable(::javax::swing::JComboBox *) = 0;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_ComboBoxUI__
diff --git a/libjava/javax/swing/plaf/ComponentInputMapUIResource.h b/libjava/javax/swing/plaf/ComponentInputMapUIResource.h
new file mode 100644
index 000000000..52accf480
--- /dev/null
+++ b/libjava/javax/swing/plaf/ComponentInputMapUIResource.h
@@ -0,0 +1,33 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_ComponentInputMapUIResource__
+#define __javax_swing_plaf_ComponentInputMapUIResource__
+
+#pragma interface
+
+#include <javax/swing/ComponentInputMap.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentInputMapUIResource;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::ComponentInputMapUIResource : public ::javax::swing::ComponentInputMap
+{
+
+public:
+  ComponentInputMapUIResource(::javax::swing::JComponent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_ComponentInputMapUIResource__
diff --git a/libjava/javax/swing/plaf/ComponentUI.h b/libjava/javax/swing/plaf/ComponentUI.h
new file mode 100644
index 000000000..3f14af6c8
--- /dev/null
+++ b/libjava/javax/swing/plaf/ComponentUI.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_ComponentUI__
+#define __javax_swing_plaf_ComponentUI__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::ComponentUI : public ::java::lang::Object
+{
+
+public:
+  ComponentUI();
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_ComponentUI__
diff --git a/libjava/javax/swing/plaf/DesktopIconUI.h b/libjava/javax/swing/plaf/DesktopIconUI.h
new file mode 100644
index 000000000..6f3fb24d6
--- /dev/null
+++ b/libjava/javax/swing/plaf/DesktopIconUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_DesktopIconUI__
+#define __javax_swing_plaf_DesktopIconUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class DesktopIconUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::DesktopIconUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  DesktopIconUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_DesktopIconUI__
diff --git a/libjava/javax/swing/plaf/DesktopPaneUI.h b/libjava/javax/swing/plaf/DesktopPaneUI.h
new file mode 100644
index 000000000..308120dc1
--- /dev/null
+++ b/libjava/javax/swing/plaf/DesktopPaneUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_DesktopPaneUI__
+#define __javax_swing_plaf_DesktopPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class DesktopPaneUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::DesktopPaneUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  DesktopPaneUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_DesktopPaneUI__
diff --git a/libjava/javax/swing/plaf/DimensionUIResource.h b/libjava/javax/swing/plaf/DimensionUIResource.h
new file mode 100644
index 000000000..620a35d05
--- /dev/null
+++ b/libjava/javax/swing/plaf/DimensionUIResource.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_DimensionUIResource__
+#define __javax_swing_plaf_DimensionUIResource__
+
+#pragma interface
+
+#include <java/awt/Dimension.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class DimensionUIResource;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::DimensionUIResource : public ::java::awt::Dimension
+{
+
+public:
+  DimensionUIResource(jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_DimensionUIResource__
diff --git a/libjava/javax/swing/plaf/FileChooserUI.h b/libjava/javax/swing/plaf/FileChooserUI.h
new file mode 100644
index 000000000..3a166bac0
--- /dev/null
+++ b/libjava/javax/swing/plaf/FileChooserUI.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_FileChooserUI__
+#define __javax_swing_plaf_FileChooserUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JFileChooser;
+      namespace filechooser
+      {
+          class FileFilter;
+          class FileView;
+      }
+      namespace plaf
+      {
+          class FileChooserUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::FileChooserUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  FileChooserUI();
+  virtual ::javax::swing::filechooser::FileFilter * getAcceptAllFileFilter(::javax::swing::JFileChooser *) = 0;
+  virtual ::javax::swing::filechooser::FileView * getFileView(::javax::swing::JFileChooser *) = 0;
+  virtual ::java::lang::String * getApproveButtonText(::javax::swing::JFileChooser *) = 0;
+  virtual ::java::lang::String * getDialogTitle(::javax::swing::JFileChooser *) = 0;
+  virtual void rescanCurrentDirectory(::javax::swing::JFileChooser *) = 0;
+  virtual void ensureFileIsVisible(::javax::swing::JFileChooser *, ::java::io::File *) = 0;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_FileChooserUI__
diff --git a/libjava/javax/swing/plaf/FontUIResource.h b/libjava/javax/swing/plaf/FontUIResource.h
new file mode 100644
index 000000000..4f2b8353b
--- /dev/null
+++ b/libjava/javax/swing/plaf/FontUIResource.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_FontUIResource__
+#define __javax_swing_plaf_FontUIResource__
+
+#pragma interface
+
+#include <java/awt/Font.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Font;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class FontUIResource;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::FontUIResource : public ::java::awt::Font
+{
+
+public:
+  FontUIResource(::java::lang::String *, jint, jint);
+  FontUIResource(::java::awt::Font *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_FontUIResource__
diff --git a/libjava/javax/swing/plaf/IconUIResource.h b/libjava/javax/swing/plaf/IconUIResource.h
new file mode 100644
index 000000000..f1e704749
--- /dev/null
+++ b/libjava/javax/swing/plaf/IconUIResource.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_IconUIResource__
+#define __javax_swing_plaf_IconUIResource__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+      namespace plaf
+      {
+          class IconUIResource;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::IconUIResource : public ::java::lang::Object
+{
+
+public:
+  IconUIResource(::javax::swing::Icon *);
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+public: // actually package-private
+  static const jlong serialVersionUID = 3327049506004830542LL;
+private:
+  ::javax::swing::Icon * __attribute__((aligned(__alignof__( ::java::lang::Object)))) delegate;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_IconUIResource__
diff --git a/libjava/javax/swing/plaf/InputMapUIResource.h b/libjava/javax/swing/plaf/InputMapUIResource.h
new file mode 100644
index 000000000..448fc817e
--- /dev/null
+++ b/libjava/javax/swing/plaf/InputMapUIResource.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_InputMapUIResource__
+#define __javax_swing_plaf_InputMapUIResource__
+
+#pragma interface
+
+#include <javax/swing/InputMap.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class InputMapUIResource;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::InputMapUIResource : public ::javax::swing::InputMap
+{
+
+public:
+  InputMapUIResource();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_InputMapUIResource__
diff --git a/libjava/javax/swing/plaf/InsetsUIResource.h b/libjava/javax/swing/plaf/InsetsUIResource.h
new file mode 100644
index 000000000..f9621375d
--- /dev/null
+++ b/libjava/javax/swing/plaf/InsetsUIResource.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_InsetsUIResource__
+#define __javax_swing_plaf_InsetsUIResource__
+
+#pragma interface
+
+#include <java/awt/Insets.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class InsetsUIResource;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::InsetsUIResource : public ::java::awt::Insets
+{
+
+public:
+  InsetsUIResource(jint, jint, jint, jint);
+public: // actually package-private
+  static const jlong serialVersionUID = 5622110143266315421LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_InsetsUIResource__
diff --git a/libjava/javax/swing/plaf/InternalFrameUI.h b/libjava/javax/swing/plaf/InternalFrameUI.h
new file mode 100644
index 000000000..1aa4f76af
--- /dev/null
+++ b/libjava/javax/swing/plaf/InternalFrameUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_InternalFrameUI__
+#define __javax_swing_plaf_InternalFrameUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class InternalFrameUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::InternalFrameUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  InternalFrameUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_InternalFrameUI__
diff --git a/libjava/javax/swing/plaf/LabelUI.h b/libjava/javax/swing/plaf/LabelUI.h
new file mode 100644
index 000000000..018087af0
--- /dev/null
+++ b/libjava/javax/swing/plaf/LabelUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_LabelUI__
+#define __javax_swing_plaf_LabelUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class LabelUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::LabelUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  LabelUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_LabelUI__
diff --git a/libjava/javax/swing/plaf/ListUI.h b/libjava/javax/swing/plaf/ListUI.h
new file mode 100644
index 000000000..241768f02
--- /dev/null
+++ b/libjava/javax/swing/plaf/ListUI.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_ListUI__
+#define __javax_swing_plaf_ListUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Point;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JList;
+      namespace plaf
+      {
+          class ListUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::ListUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  ListUI();
+  virtual jint locationToIndex(::javax::swing::JList *, ::java::awt::Point *) = 0;
+  virtual ::java::awt::Point * indexToLocation(::javax::swing::JList *, jint) = 0;
+  virtual ::java::awt::Rectangle * getCellBounds(::javax::swing::JList *, jint, jint) = 0;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_ListUI__
diff --git a/libjava/javax/swing/plaf/MenuBarUI.h b/libjava/javax/swing/plaf/MenuBarUI.h
new file mode 100644
index 000000000..cf2aba654
--- /dev/null
+++ b/libjava/javax/swing/plaf/MenuBarUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_MenuBarUI__
+#define __javax_swing_plaf_MenuBarUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class MenuBarUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::MenuBarUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  MenuBarUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_MenuBarUI__
diff --git a/libjava/javax/swing/plaf/MenuItemUI.h b/libjava/javax/swing/plaf/MenuItemUI.h
new file mode 100644
index 000000000..9f4692bd8
--- /dev/null
+++ b/libjava/javax/swing/plaf/MenuItemUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_MenuItemUI__
+#define __javax_swing_plaf_MenuItemUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ButtonUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class MenuItemUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::MenuItemUI : public ::javax::swing::plaf::ButtonUI
+{
+
+public:
+  MenuItemUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_MenuItemUI__
diff --git a/libjava/javax/swing/plaf/OptionPaneUI.h b/libjava/javax/swing/plaf/OptionPaneUI.h
new file mode 100644
index 000000000..1dbd6b8c8
--- /dev/null
+++ b/libjava/javax/swing/plaf/OptionPaneUI.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_OptionPaneUI__
+#define __javax_swing_plaf_OptionPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JOptionPane;
+      namespace plaf
+      {
+          class OptionPaneUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::OptionPaneUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  OptionPaneUI();
+  virtual void selectInitialValue(::javax::swing::JOptionPane *) = 0;
+  virtual jboolean containsCustomComponents(::javax::swing::JOptionPane *) = 0;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_OptionPaneUI__
diff --git a/libjava/javax/swing/plaf/PanelUI.h b/libjava/javax/swing/plaf/PanelUI.h
new file mode 100644
index 000000000..9b962235b
--- /dev/null
+++ b/libjava/javax/swing/plaf/PanelUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_PanelUI__
+#define __javax_swing_plaf_PanelUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class PanelUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::PanelUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  PanelUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_PanelUI__
diff --git a/libjava/javax/swing/plaf/PopupMenuUI.h b/libjava/javax/swing/plaf/PopupMenuUI.h
new file mode 100644
index 000000000..16aa6b5a1
--- /dev/null
+++ b/libjava/javax/swing/plaf/PopupMenuUI.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_PopupMenuUI__
+#define __javax_swing_plaf_PopupMenuUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JPopupMenu;
+        class Popup;
+      namespace plaf
+      {
+          class PopupMenuUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::PopupMenuUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  PopupMenuUI();
+  virtual jboolean isPopupTrigger(::java::awt::event::MouseEvent *);
+  virtual ::javax::swing::Popup * getPopup(::javax::swing::JPopupMenu *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_PopupMenuUI__
diff --git a/libjava/javax/swing/plaf/ProgressBarUI.h b/libjava/javax/swing/plaf/ProgressBarUI.h
new file mode 100644
index 000000000..d9e6714ac
--- /dev/null
+++ b/libjava/javax/swing/plaf/ProgressBarUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_ProgressBarUI__
+#define __javax_swing_plaf_ProgressBarUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class ProgressBarUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::ProgressBarUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  ProgressBarUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_ProgressBarUI__
diff --git a/libjava/javax/swing/plaf/RootPaneUI.h b/libjava/javax/swing/plaf/RootPaneUI.h
new file mode 100644
index 000000000..3e82895d7
--- /dev/null
+++ b/libjava/javax/swing/plaf/RootPaneUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_RootPaneUI__
+#define __javax_swing_plaf_RootPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class RootPaneUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::RootPaneUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  RootPaneUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_RootPaneUI__
diff --git a/libjava/javax/swing/plaf/ScrollBarUI.h b/libjava/javax/swing/plaf/ScrollBarUI.h
new file mode 100644
index 000000000..24854eff2
--- /dev/null
+++ b/libjava/javax/swing/plaf/ScrollBarUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_ScrollBarUI__
+#define __javax_swing_plaf_ScrollBarUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class ScrollBarUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::ScrollBarUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  ScrollBarUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_ScrollBarUI__
diff --git a/libjava/javax/swing/plaf/ScrollPaneUI.h b/libjava/javax/swing/plaf/ScrollPaneUI.h
new file mode 100644
index 000000000..725317535
--- /dev/null
+++ b/libjava/javax/swing/plaf/ScrollPaneUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_ScrollPaneUI__
+#define __javax_swing_plaf_ScrollPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class ScrollPaneUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::ScrollPaneUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  ScrollPaneUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_ScrollPaneUI__
diff --git a/libjava/javax/swing/plaf/SeparatorUI.h b/libjava/javax/swing/plaf/SeparatorUI.h
new file mode 100644
index 000000000..c968d73cc
--- /dev/null
+++ b/libjava/javax/swing/plaf/SeparatorUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_SeparatorUI__
+#define __javax_swing_plaf_SeparatorUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class SeparatorUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::SeparatorUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  SeparatorUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_SeparatorUI__
diff --git a/libjava/javax/swing/plaf/SliderUI.h b/libjava/javax/swing/plaf/SliderUI.h
new file mode 100644
index 000000000..bc18a5f73
--- /dev/null
+++ b/libjava/javax/swing/plaf/SliderUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_SliderUI__
+#define __javax_swing_plaf_SliderUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class SliderUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::SliderUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  SliderUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_SliderUI__
diff --git a/libjava/javax/swing/plaf/SpinnerUI.h b/libjava/javax/swing/plaf/SpinnerUI.h
new file mode 100644
index 000000000..c20f12d92
--- /dev/null
+++ b/libjava/javax/swing/plaf/SpinnerUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_SpinnerUI__
+#define __javax_swing_plaf_SpinnerUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class SpinnerUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::SpinnerUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  SpinnerUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_SpinnerUI__
diff --git a/libjava/javax/swing/plaf/SplitPaneUI.h b/libjava/javax/swing/plaf/SplitPaneUI.h
new file mode 100644
index 000000000..31c1ec169
--- /dev/null
+++ b/libjava/javax/swing/plaf/SplitPaneUI.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_SplitPaneUI__
+#define __javax_swing_plaf_SplitPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JSplitPane;
+      namespace plaf
+      {
+          class SplitPaneUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::SplitPaneUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  SplitPaneUI();
+  virtual void resetToPreferredSizes(::javax::swing::JSplitPane *) = 0;
+  virtual void setDividerLocation(::javax::swing::JSplitPane *, jint) = 0;
+  virtual jint getDividerLocation(::javax::swing::JSplitPane *) = 0;
+  virtual jint getMinimumDividerLocation(::javax::swing::JSplitPane *) = 0;
+  virtual jint getMaximumDividerLocation(::javax::swing::JSplitPane *) = 0;
+  virtual void finishedPaintingChildren(::javax::swing::JSplitPane *, ::java::awt::Graphics *) = 0;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_SplitPaneUI__
diff --git a/libjava/javax/swing/plaf/TabbedPaneUI.h b/libjava/javax/swing/plaf/TabbedPaneUI.h
new file mode 100644
index 000000000..725554a38
--- /dev/null
+++ b/libjava/javax/swing/plaf/TabbedPaneUI.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_TabbedPaneUI__
+#define __javax_swing_plaf_TabbedPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JTabbedPane;
+      namespace plaf
+      {
+          class TabbedPaneUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::TabbedPaneUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  TabbedPaneUI();
+  virtual jint tabForCoordinate(::javax::swing::JTabbedPane *, jint, jint) = 0;
+  virtual ::java::awt::Rectangle * getTabBounds(::javax::swing::JTabbedPane *, jint) = 0;
+  virtual jint getTabRunCount(::javax::swing::JTabbedPane *) = 0;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_TabbedPaneUI__
diff --git a/libjava/javax/swing/plaf/TableHeaderUI.h b/libjava/javax/swing/plaf/TableHeaderUI.h
new file mode 100644
index 000000000..cc0c5c8f3
--- /dev/null
+++ b/libjava/javax/swing/plaf/TableHeaderUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_TableHeaderUI__
+#define __javax_swing_plaf_TableHeaderUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class TableHeaderUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::TableHeaderUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  TableHeaderUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_TableHeaderUI__
diff --git a/libjava/javax/swing/plaf/TableUI.h b/libjava/javax/swing/plaf/TableUI.h
new file mode 100644
index 000000000..5e8c51d77
--- /dev/null
+++ b/libjava/javax/swing/plaf/TableUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_TableUI__
+#define __javax_swing_plaf_TableUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class TableUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::TableUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  TableUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_TableUI__
diff --git a/libjava/javax/swing/plaf/TextUI.h b/libjava/javax/swing/plaf/TextUI.h
new file mode 100644
index 000000000..1c4faf66d
--- /dev/null
+++ b/libjava/javax/swing/plaf/TextUI.h
@@ -0,0 +1,59 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_TextUI__
+#define __javax_swing_plaf_TextUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Point;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class TextUI;
+      }
+      namespace text
+      {
+          class EditorKit;
+          class JTextComponent;
+          class Position$Bias;
+          class View;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::TextUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  TextUI();
+  virtual ::java::awt::Rectangle * modelToView(::javax::swing::text::JTextComponent *, jint) = 0;
+  virtual ::java::awt::Rectangle * modelToView(::javax::swing::text::JTextComponent *, jint, ::javax::swing::text::Position$Bias *) = 0;
+  virtual jint viewToModel(::javax::swing::text::JTextComponent *, ::java::awt::Point *) = 0;
+  virtual jint viewToModel(::javax::swing::text::JTextComponent *, ::java::awt::Point *, JArray< ::javax::swing::text::Position$Bias * > *) = 0;
+  virtual jint getNextVisualPositionFrom(::javax::swing::text::JTextComponent *, jint, ::javax::swing::text::Position$Bias *, jint, JArray< ::javax::swing::text::Position$Bias * > *) = 0;
+  virtual void damageRange(::javax::swing::text::JTextComponent *, jint, jint) = 0;
+  virtual void damageRange(::javax::swing::text::JTextComponent *, jint, jint, ::javax::swing::text::Position$Bias *, ::javax::swing::text::Position$Bias *) = 0;
+  virtual ::javax::swing::text::EditorKit * getEditorKit(::javax::swing::text::JTextComponent *) = 0;
+  virtual ::javax::swing::text::View * getRootView(::javax::swing::text::JTextComponent *) = 0;
+  virtual ::java::lang::String * getToolTipText(::javax::swing::text::JTextComponent *, ::java::awt::Point *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_TextUI__
diff --git a/libjava/javax/swing/plaf/ToolBarUI.h b/libjava/javax/swing/plaf/ToolBarUI.h
new file mode 100644
index 000000000..79600b2a9
--- /dev/null
+++ b/libjava/javax/swing/plaf/ToolBarUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_ToolBarUI__
+#define __javax_swing_plaf_ToolBarUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class ToolBarUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::ToolBarUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  ToolBarUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_ToolBarUI__
diff --git a/libjava/javax/swing/plaf/ToolTipUI.h b/libjava/javax/swing/plaf/ToolTipUI.h
new file mode 100644
index 000000000..2c061abb8
--- /dev/null
+++ b/libjava/javax/swing/plaf/ToolTipUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_ToolTipUI__
+#define __javax_swing_plaf_ToolTipUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class ToolTipUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::ToolTipUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  ToolTipUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_ToolTipUI__
diff --git a/libjava/javax/swing/plaf/TreeUI.h b/libjava/javax/swing/plaf/TreeUI.h
new file mode 100644
index 000000000..69bbc1215
--- /dev/null
+++ b/libjava/javax/swing/plaf/TreeUI.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_TreeUI__
+#define __javax_swing_plaf_TreeUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JTree;
+      namespace plaf
+      {
+          class TreeUI;
+      }
+      namespace tree
+      {
+          class TreePath;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::TreeUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  TreeUI();
+  virtual ::java::awt::Rectangle * getPathBounds(::javax::swing::JTree *, ::javax::swing::tree::TreePath *) = 0;
+  virtual ::javax::swing::tree::TreePath * getPathForRow(::javax::swing::JTree *, jint) = 0;
+  virtual jint getRowForPath(::javax::swing::JTree *, ::javax::swing::tree::TreePath *) = 0;
+  virtual jint getRowCount(::javax::swing::JTree *) = 0;
+  virtual ::javax::swing::tree::TreePath * getClosestPathForLocation(::javax::swing::JTree *, jint, jint) = 0;
+  virtual jboolean isEditing(::javax::swing::JTree *) = 0;
+  virtual jboolean stopEditing(::javax::swing::JTree *) = 0;
+  virtual void cancelEditing(::javax::swing::JTree *) = 0;
+  virtual void startEditingAtPath(::javax::swing::JTree *, ::javax::swing::tree::TreePath *) = 0;
+  virtual ::javax::swing::tree::TreePath * getEditingPath(::javax::swing::JTree *) = 0;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_TreeUI__
diff --git a/libjava/javax/swing/plaf/UIResource.h b/libjava/javax/swing/plaf/UIResource.h
new file mode 100644
index 000000000..0ddd78926
--- /dev/null
+++ b/libjava/javax/swing/plaf/UIResource.h
@@ -0,0 +1,31 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_UIResource__
+#define __javax_swing_plaf_UIResource__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class UIResource;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::UIResource : public ::java::lang::Object
+{
+
+public:
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_plaf_UIResource__
diff --git a/libjava/javax/swing/plaf/ViewportUI.h b/libjava/javax/swing/plaf/ViewportUI.h
new file mode 100644
index 000000000..64855b17a
--- /dev/null
+++ b/libjava/javax/swing/plaf/ViewportUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_ViewportUI__
+#define __javax_swing_plaf_ViewportUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComponentUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class ViewportUI;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::ViewportUI : public ::javax::swing::plaf::ComponentUI
+{
+
+public:
+  ViewportUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_ViewportUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicArrowButton.h b/libjava/javax/swing/plaf/basic/BasicArrowButton.h
new file mode 100644
index 000000000..033f499aa
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicArrowButton.h
@@ -0,0 +1,65 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicArrowButton__
+#define __javax_swing_plaf_basic_BasicArrowButton__
+
+#pragma interface
+
+#include <javax/swing/JButton.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicArrowButton;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicArrowButton : public ::javax::swing::JButton
+{
+
+public:
+  BasicArrowButton(jint);
+  BasicArrowButton(jint, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
+  virtual jboolean isFocusTraversable();
+  virtual jint getDirection();
+  virtual void setDirection(jint);
+  virtual void paint(::java::awt::Graphics *);
+  virtual ::java::awt::Dimension * getPreferredSize();
+  virtual ::java::awt::Dimension * getMinimumSize();
+  virtual ::java::awt::Dimension * getMaximumSize();
+  virtual void paintTriangle(::java::awt::Graphics *, jint, jint, jint, jint, jboolean);
+private:
+  void paintTriangleNorth(::java::awt::Graphics *, jint, jint, jint, jboolean);
+  void paintTriangleSouth(::java::awt::Graphics *, jint, jint, jint, jboolean);
+  void paintTriangleEast(::java::awt::Graphics *, jint, jint, jint, jboolean);
+  void paintTriangleWest(::java::awt::Graphics *, jint, jint, jint, jboolean);
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::javax::swing::JButton)))) direction;
+public: // actually package-private
+  ::java::awt::Color * shadow;
+  ::java::awt::Color * darkShadow;
+  ::java::awt::Color * highlight;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicArrowButton__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders$ButtonBorder.h b/libjava/javax/swing/plaf/basic/BasicBorders$ButtonBorder.h
new file mode 100644
index 000000000..b4a2c9157
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicBorders$ButtonBorder.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicBorders$ButtonBorder__
+#define __javax_swing_plaf_basic_BasicBorders$ButtonBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicBorders$ButtonBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicBorders$ButtonBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  BasicBorders$ButtonBorder(::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+public: // actually package-private
+  static const jlong serialVersionUID = -157053874580739687LL;
+public: // actually protected
+  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) shadow;
+  ::java::awt::Color * darkShadow;
+  ::java::awt::Color * highlight;
+  ::java::awt::Color * lightHighlight;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicBorders$ButtonBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders$FieldBorder.h b/libjava/javax/swing/plaf/basic/BasicBorders$FieldBorder.h
new file mode 100644
index 000000000..455b711c0
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicBorders$FieldBorder.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicBorders$FieldBorder__
+#define __javax_swing_plaf_basic_BasicBorders$FieldBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicBorders$FieldBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicBorders$FieldBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  BasicBorders$FieldBorder(::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+public: // actually package-private
+  static const jlong serialVersionUID = 949220756998454908LL;
+public: // actually protected
+  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) shadow;
+  ::java::awt::Color * darkShadow;
+  ::java::awt::Color * highlight;
+  ::java::awt::Color * lightHighlight;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicBorders$FieldBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders$MarginBorder.h b/libjava/javax/swing/plaf/basic/BasicBorders$MarginBorder.h
new file mode 100644
index 000000000..a974a460a
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicBorders$MarginBorder.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicBorders$MarginBorder__
+#define __javax_swing_plaf_basic_BasicBorders$MarginBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicBorders$MarginBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicBorders$MarginBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  BasicBorders$MarginBorder();
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+public: // actually package-private
+  static const jlong serialVersionUID = -3035848353448896090LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicBorders$MarginBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders$MenuBarBorder.h b/libjava/javax/swing/plaf/basic/BasicBorders$MenuBarBorder.h
new file mode 100644
index 000000000..fcf26ba59
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicBorders$MenuBarBorder.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicBorders$MenuBarBorder__
+#define __javax_swing_plaf_basic_BasicBorders$MenuBarBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicBorders$MenuBarBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicBorders$MenuBarBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  BasicBorders$MenuBarBorder(::java::awt::Color *, ::java::awt::Color *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+public: // actually package-private
+  static const jlong serialVersionUID = -6909056571935227506LL;
+private:
+  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) shadow;
+  ::java::awt::Color * highlight;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicBorders$MenuBarBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders$RadioButtonBorder.h b/libjava/javax/swing/plaf/basic/BasicBorders$RadioButtonBorder.h
new file mode 100644
index 000000000..b737890ed
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicBorders$RadioButtonBorder.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicBorders$RadioButtonBorder__
+#define __javax_swing_plaf_basic_BasicBorders$RadioButtonBorder__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicBorders$ButtonBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicBorders$RadioButtonBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicBorders$RadioButtonBorder : public ::javax::swing::plaf::basic::BasicBorders$ButtonBorder
+{
+
+public:
+  BasicBorders$RadioButtonBorder(::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+public: // actually package-private
+  static const jlong serialVersionUID = 1596945751743747369LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicBorders$RadioButtonBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders$RolloverButtonBorder.h b/libjava/javax/swing/plaf/basic/BasicBorders$RolloverButtonBorder.h
new file mode 100644
index 000000000..84d6ee076
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicBorders$RolloverButtonBorder.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicBorders$RolloverButtonBorder__
+#define __javax_swing_plaf_basic_BasicBorders$RolloverButtonBorder__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicBorders$ButtonBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicBorders$RolloverButtonBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicBorders$RolloverButtonBorder : public ::javax::swing::plaf::basic::BasicBorders$ButtonBorder
+{
+
+public:
+  BasicBorders$RolloverButtonBorder(::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+public: // actually package-private
+  static const jlong serialVersionUID = 1976364864896996846LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicBorders$RolloverButtonBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders$SplitPaneBorder.h b/libjava/javax/swing/plaf/basic/BasicBorders$SplitPaneBorder.h
new file mode 100644
index 000000000..3a7d22f30
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicBorders$SplitPaneBorder.h
@@ -0,0 +1,61 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicBorders$SplitPaneBorder__
+#define __javax_swing_plaf_basic_BasicBorders$SplitPaneBorder__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Graphics;
+        class Insets;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicBorders$SplitPaneBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicBorders$SplitPaneBorder : public ::java::lang::Object
+{
+
+public:
+  BasicBorders$SplitPaneBorder(::java::awt::Color *, ::java::awt::Color *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+private:
+  void paintRect(::java::awt::Graphics *, jint, jboolean, jint, jint, ::java::awt::Rectangle *);
+public:
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual jboolean isBorderOpaque();
+private:
+  static const jint SUPPRESS_TOP = 1;
+  static const jint SUPPRESS_LEFT = 2;
+  static const jint SUPPRESS_BOTTOM = 4;
+  static const jint SUPPRESS_RIGHT = 8;
+public: // actually protected
+  ::java::awt::Color * __attribute__((aligned(__alignof__( ::java::lang::Object)))) highlight;
+  ::java::awt::Color * shadow;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicBorders$SplitPaneBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders$SplitPaneDividerBorder.h b/libjava/javax/swing/plaf/basic/BasicBorders$SplitPaneDividerBorder.h
new file mode 100644
index 000000000..90a89464b
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicBorders$SplitPaneDividerBorder.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicBorders$SplitPaneDividerBorder__
+#define __javax_swing_plaf_basic_BasicBorders$SplitPaneDividerBorder__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JSplitPane;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicBorders$SplitPaneDividerBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicBorders$SplitPaneDividerBorder : public ::java::lang::Object
+{
+
+public:
+  BasicBorders$SplitPaneDividerBorder();
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual jboolean isBorderOpaque();
+private:
+  ::javax::swing::JSplitPane * getSplitPane(::java::awt::Component *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicBorders$SplitPaneDividerBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders$ToggleButtonBorder.h b/libjava/javax/swing/plaf/basic/BasicBorders$ToggleButtonBorder.h
new file mode 100644
index 000000000..73d1f1c4e
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicBorders$ToggleButtonBorder.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicBorders$ToggleButtonBorder__
+#define __javax_swing_plaf_basic_BasicBorders$ToggleButtonBorder__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicBorders$ButtonBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicBorders$ToggleButtonBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicBorders$ToggleButtonBorder : public ::javax::swing::plaf::basic::BasicBorders$ButtonBorder
+{
+
+public:
+  BasicBorders$ToggleButtonBorder(::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+public: // actually package-private
+  static const jlong serialVersionUID = -3528666548001058394LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicBorders$ToggleButtonBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders.h b/libjava/javax/swing/plaf/basic/BasicBorders.h
new file mode 100644
index 000000000..e32e2b266
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicBorders.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicBorders__
+#define __javax_swing_plaf_basic_BasicBorders__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace border
+      {
+          class Border;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicBorders;
+            class BasicBorders$MarginBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicBorders : public ::java::lang::Object
+{
+
+public:
+  BasicBorders();
+  static ::javax::swing::border::Border * getButtonBorder();
+  static ::javax::swing::border::Border * getRadioButtonBorder();
+  static ::javax::swing::border::Border * getToggleButtonBorder();
+  static ::javax::swing::border::Border * getMenuBarBorder();
+  static ::javax::swing::border::Border * getSplitPaneBorder();
+  static ::javax::swing::border::Border * getSplitPaneDividerBorder();
+  static ::javax::swing::border::Border * getTextFieldBorder();
+  static ::javax::swing::border::Border * getProgressBarBorder();
+  static ::javax::swing::border::Border * getInternalFrameBorder();
+public: // actually package-private
+  static ::javax::swing::border::Border * getMarginBorder();
+private:
+  static ::javax::swing::plaf::basic::BasicBorders$MarginBorder * sharedMarginBorder;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicBorders__
diff --git a/libjava/javax/swing/plaf/basic/BasicButtonListener$1.h b/libjava/javax/swing/plaf/basic/BasicButtonListener$1.h
new file mode 100644
index 000000000..85f3a162b
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicButtonListener$1.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicButtonListener$1__
+#define __javax_swing_plaf_basic_BasicButtonListener$1__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicButtonListener;
+            class BasicButtonListener$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicButtonListener$1 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicButtonListener$1(::javax::swing::plaf::basic::BasicButtonListener *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicButtonListener * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicButtonListener$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicButtonListener$2.h b/libjava/javax/swing/plaf/basic/BasicButtonListener$2.h
new file mode 100644
index 000000000..fe6dd492a
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicButtonListener$2.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicButtonListener$2__
+#define __javax_swing_plaf_basic_BasicButtonListener$2__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicButtonListener;
+            class BasicButtonListener$2;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicButtonListener$2 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicButtonListener$2(::javax::swing::plaf::basic::BasicButtonListener *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicButtonListener * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicButtonListener$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicButtonListener$ButtonAction.h b/libjava/javax/swing/plaf/basic/BasicButtonListener$ButtonAction.h
new file mode 100644
index 000000000..6e08aa431
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicButtonListener$ButtonAction.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicButtonListener$ButtonAction__
+#define __javax_swing_plaf_basic_BasicButtonListener$ButtonAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicButtonListener;
+            class BasicButtonListener$ButtonAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicButtonListener$ButtonAction : public ::javax::swing::AbstractAction
+{
+
+  BasicButtonListener$ButtonAction(::javax::swing::plaf::basic::BasicButtonListener *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual jboolean isEnabled(::java::lang::Object *);
+public: // actually package-private
+  BasicButtonListener$ButtonAction(::javax::swing::plaf::basic::BasicButtonListener *, ::javax::swing::plaf::basic::BasicButtonListener$ButtonAction *);
+  static ::java::lang::String * PRESSED;
+  static ::java::lang::String * RELEASED;
+  ::javax::swing::plaf::basic::BasicButtonListener * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicButtonListener$ButtonAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicButtonListener.h b/libjava/javax/swing/plaf/basic/BasicButtonListener.h
new file mode 100644
index 000000000..8b7cd51d2
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicButtonListener.h
@@ -0,0 +1,76 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicButtonListener__
+#define __javax_swing_plaf_basic_BasicButtonListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class FocusEvent;
+          class MouseEvent;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class AbstractButton;
+        class ActionMap;
+        class JComponent;
+      namespace event
+      {
+          class ChangeEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicButtonListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicButtonListener : public ::java::lang::Object
+{
+
+public:
+  BasicButtonListener(::javax::swing::AbstractButton *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually protected
+  virtual void checkOpacity(::javax::swing::AbstractButton *);
+public:
+  virtual void focusGained(::java::awt::event::FocusEvent *);
+  virtual void focusLost(::java::awt::event::FocusEvent *);
+  virtual void installKeyboardActions(::javax::swing::JComponent *);
+private:
+  ::javax::swing::ActionMap * createDefaultActionMap();
+public:
+  virtual void uninstallKeyboardActions(::javax::swing::JComponent *);
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+  virtual void mouseClicked(::java::awt::event::MouseEvent *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+  virtual void mouseEntered(::java::awt::event::MouseEvent *);
+  virtual void mouseExited(::java::awt::event::MouseEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicButtonListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicButtonUI.h b/libjava/javax/swing/plaf/basic/BasicButtonUI.h
new file mode 100644
index 000000000..c7209c0a3
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicButtonUI.h
@@ -0,0 +1,96 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicButtonUI__
+#define __javax_swing_plaf_basic_BasicButtonUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ButtonUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+        class Insets;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class AbstractButton;
+        class Icon;
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicButtonListener;
+            class BasicButtonUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicButtonUI : public ::javax::swing::plaf::ButtonUI
+{
+
+public:
+  BasicButtonUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual jint getDefaultTextIconGap(::javax::swing::AbstractButton *);
+public: // actually protected
+  virtual void clearTextShiftOffset();
+  virtual jint getTextShiftOffset();
+  virtual void setTextShiftOffset();
+  virtual ::java::lang::String * getPropertyPrefix();
+  virtual void installDefaults(::javax::swing::AbstractButton *);
+  virtual void uninstallDefaults(::javax::swing::AbstractButton *);
+  virtual ::javax::swing::plaf::basic::BasicButtonListener * createButtonListener(::javax::swing::AbstractButton *);
+  virtual void installListeners(::javax::swing::AbstractButton *);
+  virtual void uninstallListeners(::javax::swing::AbstractButton *);
+  virtual void installKeyboardActions(::javax::swing::AbstractButton *);
+  virtual void uninstallKeyboardActions(::javax::swing::AbstractButton *);
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+public: // actually package-private
+  static ::javax::swing::Icon * currentIcon(::javax::swing::AbstractButton *);
+public:
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+public: // actually protected
+  virtual void paintFocus(::java::awt::Graphics *, ::javax::swing::AbstractButton *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, ::java::awt::Rectangle *);
+  virtual void paintIcon(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *);
+  virtual void paintButtonPressed(::java::awt::Graphics *, ::javax::swing::AbstractButton *);
+  virtual void paintText(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *, ::java::lang::String *);
+  virtual void paintText(::java::awt::Graphics *, ::javax::swing::AbstractButton *, ::java::awt::Rectangle *, ::java::lang::String *);
+private:
+  ::javax::swing::plaf::basic::BasicButtonListener * getButtonListener(::javax::swing::AbstractButton *);
+public: // actually package-private
+  static ::java::awt::Rectangle * viewR;
+  static ::java::awt::Rectangle * iconR;
+  static ::java::awt::Rectangle * textR;
+  static ::java::awt::Insets * cachedInsets;
+private:
+  static ::javax::swing::plaf::basic::BasicButtonUI * sharedUI;
+  static ::javax::swing::plaf::basic::BasicButtonListener * sharedListener;
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::javax::swing::plaf::ButtonUI)))) defaultTextIconGap;
+  jint defaultTextShiftOffset;
+private:
+  jint textShiftOffset;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicButtonUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.h b/libjava/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.h
new file mode 100644
index 000000000..68f69f589
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicCheckBoxMenuItemUI__
+#define __javax_swing_plaf_basic_BasicCheckBoxMenuItemUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicMenuItemUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class JMenuItem;
+        class MenuElement;
+        class MenuSelectionManager;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicCheckBoxMenuItemUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicCheckBoxMenuItemUI : public ::javax::swing::plaf::basic::BasicMenuItemUI
+{
+
+public:
+  BasicCheckBoxMenuItemUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::lang::String * getPropertyPrefix();
+public:
+  virtual void processMouseEvent(::javax::swing::JMenuItem *, ::java::awt::event::MouseEvent *, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicCheckBoxMenuItemUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicCheckBoxUI.h b/libjava/javax/swing/plaf/basic/BasicCheckBoxUI.h
new file mode 100644
index 000000000..ca6b44b3c
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicCheckBoxUI.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicCheckBoxUI__
+#define __javax_swing_plaf_basic_BasicCheckBoxUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicRadioButtonUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicCheckBoxUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicCheckBoxUI : public ::javax::swing::plaf::basic::BasicRadioButtonUI
+{
+
+public:
+  BasicCheckBoxUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual ::java::lang::String * getPropertyPrefix();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicCheckBoxUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicColorChooserUI$1.h b/libjava/javax/swing/plaf/basic/BasicColorChooserUI$1.h
new file mode 100644
index 000000000..af943a65e
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicColorChooserUI$1.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicColorChooserUI$1__
+#define __javax_swing_plaf_basic_BasicColorChooserUI$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ChangeEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicColorChooserUI;
+            class BasicColorChooserUI$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicColorChooserUI$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicColorChooserUI$1(::javax::swing::plaf::basic::BasicColorChooserUI *);
+public:
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicColorChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicColorChooserUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicColorChooserUI$PreviewListener.h b/libjava/javax/swing/plaf/basic/BasicColorChooserUI$PreviewListener.h
new file mode 100644
index 000000000..a7c3a279a
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicColorChooserUI$PreviewListener.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicColorChooserUI$PreviewListener__
+#define __javax_swing_plaf_basic_BasicColorChooserUI$PreviewListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ChangeEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicColorChooserUI;
+            class BasicColorChooserUI$PreviewListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicColorChooserUI$PreviewListener : public ::java::lang::Object
+{
+
+  BasicColorChooserUI$PreviewListener(::javax::swing::plaf::basic::BasicColorChooserUI *);
+public:
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+public: // actually package-private
+  BasicColorChooserUI$PreviewListener(::javax::swing::plaf::basic::BasicColorChooserUI *, ::javax::swing::plaf::basic::BasicColorChooserUI$PreviewListener *);
+  ::javax::swing::plaf::basic::BasicColorChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicColorChooserUI$PreviewListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicColorChooserUI$PropertyHandler.h b/libjava/javax/swing/plaf/basic/BasicColorChooserUI$PropertyHandler.h
new file mode 100644
index 000000000..ed5743feb
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicColorChooserUI$PropertyHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicColorChooserUI$PropertyHandler__
+#define __javax_swing_plaf_basic_BasicColorChooserUI$PropertyHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicColorChooserUI;
+            class BasicColorChooserUI$PropertyHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicColorChooserUI$PropertyHandler : public ::java::lang::Object
+{
+
+public:
+  BasicColorChooserUI$PropertyHandler(::javax::swing::plaf::basic::BasicColorChooserUI *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicColorChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicColorChooserUI$PropertyHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicColorChooserUI$TabPaneListener.h b/libjava/javax/swing/plaf/basic/BasicColorChooserUI$TabPaneListener.h
new file mode 100644
index 000000000..3ca157fe9
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicColorChooserUI$TabPaneListener.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicColorChooserUI$TabPaneListener__
+#define __javax_swing_plaf_basic_BasicColorChooserUI$TabPaneListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ChangeEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicColorChooserUI;
+            class BasicColorChooserUI$TabPaneListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicColorChooserUI$TabPaneListener : public ::java::lang::Object
+{
+
+  BasicColorChooserUI$TabPaneListener(::javax::swing::plaf::basic::BasicColorChooserUI *);
+public:
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+public: // actually package-private
+  BasicColorChooserUI$TabPaneListener(::javax::swing::plaf::basic::BasicColorChooserUI *, ::javax::swing::plaf::basic::BasicColorChooserUI$TabPaneListener *);
+  ::javax::swing::plaf::basic::BasicColorChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicColorChooserUI$TabPaneListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicColorChooserUI.h b/libjava/javax/swing/plaf/basic/BasicColorChooserUI.h
new file mode 100644
index 000000000..83a41b05d
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicColorChooserUI.h
@@ -0,0 +1,89 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicColorChooserUI__
+#define __javax_swing_plaf_basic_BasicColorChooserUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ColorChooserUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Container;
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JColorChooser;
+        class JComponent;
+        class JTabbedPane;
+      namespace colorchooser
+      {
+          class AbstractColorChooserPanel;
+      }
+      namespace event
+      {
+          class ChangeListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicColorChooserUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicColorChooserUI : public ::javax::swing::plaf::ColorChooserUI
+{
+
+public:
+  BasicColorChooserUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual JArray< ::javax::swing::colorchooser::AbstractColorChooserPanel * > * createDefaultChoosers();
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+public: // actually package-private
+  virtual void makeTabs(JArray< ::javax::swing::colorchooser::AbstractColorChooserPanel * > *);
+public:
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void uninstallDefaultChoosers();
+  virtual void installPreviewPanel();
+public: // actually package-private
+  virtual void updatePreviewPanel(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installDefaults();
+  virtual void uninstallDefaults();
+  virtual void installListeners();
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
+  virtual void uninstallListeners();
+  JArray< ::javax::swing::colorchooser::AbstractColorChooserPanel * > * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ColorChooserUI)))) defaultChoosers;
+  ::javax::swing::event::ChangeListener * previewListener;
+  ::java::beans::PropertyChangeListener * propertyChangeListener;
+  ::javax::swing::JColorChooser * chooser;
+public: // actually package-private
+  ::javax::swing::JTabbedPane * pane;
+private:
+  ::java::awt::Container * prevContainer;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicColorChooserUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxEditor$UIResource.h b/libjava/javax/swing/plaf/basic/BasicComboBoxEditor$UIResource.h
new file mode 100644
index 000000000..36a4682b0
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboBoxEditor$UIResource.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboBoxEditor$UIResource__
+#define __javax_swing_plaf_basic_BasicComboBoxEditor$UIResource__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicComboBoxEditor.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboBoxEditor$UIResource;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboBoxEditor$UIResource : public ::javax::swing::plaf::basic::BasicComboBoxEditor
+{
+
+public:
+  BasicComboBoxEditor$UIResource();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboBoxEditor$UIResource__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxEditor.h b/libjava/javax/swing/plaf/basic/BasicComboBoxEditor.h
new file mode 100644
index 000000000..5bde099f2
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboBoxEditor.h
@@ -0,0 +1,59 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboBoxEditor__
+#define __javax_swing_plaf_basic_BasicComboBoxEditor__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+      namespace event
+      {
+          class ActionListener;
+          class FocusEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JTextField;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboBoxEditor;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboBoxEditor : public ::java::lang::Object
+{
+
+public:
+  BasicComboBoxEditor();
+  virtual ::java::awt::Component * getEditorComponent();
+  virtual void setItem(::java::lang::Object *);
+  virtual ::java::lang::Object * getItem();
+  virtual void selectAll();
+  virtual void focusGained(::java::awt::event::FocusEvent *);
+  virtual void focusLost(::java::awt::event::FocusEvent *);
+  virtual void addActionListener(::java::awt::event::ActionListener *);
+  virtual void removeActionListener(::java::awt::event::ActionListener *);
+public: // actually protected
+  ::javax::swing::JTextField * __attribute__((aligned(__alignof__( ::java::lang::Object)))) editor;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboBoxEditor__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxRenderer$UIResource.h b/libjava/javax/swing/plaf/basic/BasicComboBoxRenderer$UIResource.h
new file mode 100644
index 000000000..76eaa5c09
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboBoxRenderer$UIResource.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboBoxRenderer$UIResource__
+#define __javax_swing_plaf_basic_BasicComboBoxRenderer$UIResource__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicComboBoxRenderer.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboBoxRenderer$UIResource;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboBoxRenderer$UIResource : public ::javax::swing::plaf::basic::BasicComboBoxRenderer
+{
+
+public:
+  BasicComboBoxRenderer$UIResource();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboBoxRenderer$UIResource__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxRenderer.h b/libjava/javax/swing/plaf/basic/BasicComboBoxRenderer.h
new file mode 100644
index 000000000..746cf3ce1
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboBoxRenderer.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboBoxRenderer__
+#define __javax_swing_plaf_basic_BasicComboBoxRenderer__
+
+#pragma interface
+
+#include <javax/swing/JLabel.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JList;
+      namespace border
+      {
+          class Border;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboBoxRenderer;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboBoxRenderer : public ::javax::swing::JLabel
+{
+
+public:
+  BasicComboBoxRenderer();
+  virtual ::java::awt::Dimension * getPreferredSize();
+  virtual ::java::awt::Component * getListCellRendererComponent(::javax::swing::JList *, ::java::lang::Object *, jint, jboolean, jboolean);
+public: // actually protected
+  static ::javax::swing::border::Border * noFocusBorder;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboBoxRenderer__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ComboBoxLayoutManager.h b/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ComboBoxLayoutManager.h
new file mode 100644
index 000000000..e907fe231
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ComboBoxLayoutManager.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboBoxUI$ComboBoxLayoutManager__
+#define __javax_swing_plaf_basic_BasicComboBoxUI$ComboBoxLayoutManager__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboBoxUI;
+            class BasicComboBoxUI$ComboBoxLayoutManager;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboBoxUI$ComboBoxLayoutManager : public ::java::lang::Object
+{
+
+public:
+  BasicComboBoxUI$ComboBoxLayoutManager(::javax::swing::plaf::basic::BasicComboBoxUI *);
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+  virtual void removeLayoutComponent(::java::awt::Component *);
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual void layoutContainer(::java::awt::Container *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicComboBoxUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboBoxUI$ComboBoxLayoutManager__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$FocusHandler.h b/libjava/javax/swing/plaf/basic/BasicComboBoxUI$FocusHandler.h
new file mode 100644
index 000000000..e5f84c171
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboBoxUI$FocusHandler.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboBoxUI$FocusHandler__
+#define __javax_swing_plaf_basic_BasicComboBoxUI$FocusHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class FocusEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboBoxUI;
+            class BasicComboBoxUI$FocusHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboBoxUI$FocusHandler : public ::java::lang::Object
+{
+
+public:
+  BasicComboBoxUI$FocusHandler(::javax::swing::plaf::basic::BasicComboBoxUI *);
+  virtual void focusGained(::java::awt::event::FocusEvent *);
+  virtual void focusLost(::java::awt::event::FocusEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicComboBoxUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboBoxUI$FocusHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ItemHandler.h b/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ItemHandler.h
new file mode 100644
index 000000000..e07a46494
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ItemHandler.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboBoxUI$ItemHandler__
+#define __javax_swing_plaf_basic_BasicComboBoxUI$ItemHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ItemEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboBoxUI;
+            class BasicComboBoxUI$ItemHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboBoxUI$ItemHandler : public ::java::lang::Object
+{
+
+public:
+  BasicComboBoxUI$ItemHandler(::javax::swing::plaf::basic::BasicComboBoxUI *);
+  virtual void itemStateChanged(::java::awt::event::ItemEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicComboBoxUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboBoxUI$ItemHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$KeyHandler.h b/libjava/javax/swing/plaf/basic/BasicComboBoxUI$KeyHandler.h
new file mode 100644
index 000000000..b2657b802
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboBoxUI$KeyHandler.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboBoxUI$KeyHandler__
+#define __javax_swing_plaf_basic_BasicComboBoxUI$KeyHandler__
+
+#pragma interface
+
+#include <java/awt/event/KeyAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class KeyEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboBoxUI;
+            class BasicComboBoxUI$KeyHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboBoxUI$KeyHandler : public ::java::awt::event::KeyAdapter
+{
+
+public:
+  BasicComboBoxUI$KeyHandler(::javax::swing::plaf::basic::BasicComboBoxUI *);
+  virtual void keyPressed(::java::awt::event::KeyEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicComboBoxUI * __attribute__((aligned(__alignof__( ::java::awt::event::KeyAdapter)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboBoxUI$KeyHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ListDataHandler.h b/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ListDataHandler.h
new file mode 100644
index 000000000..8647c7fd4
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ListDataHandler.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboBoxUI$ListDataHandler__
+#define __javax_swing_plaf_basic_BasicComboBoxUI$ListDataHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ListDataEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboBoxUI;
+            class BasicComboBoxUI$ListDataHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboBoxUI$ListDataHandler : public ::java::lang::Object
+{
+
+public:
+  BasicComboBoxUI$ListDataHandler(::javax::swing::plaf::basic::BasicComboBoxUI *);
+  virtual void contentsChanged(::javax::swing::event::ListDataEvent *);
+  virtual void intervalAdded(::javax::swing::event::ListDataEvent *);
+  virtual void intervalRemoved(::javax::swing::event::ListDataEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicComboBoxUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboBoxUI$ListDataHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicComboBoxUI$PropertyChangeHandler.h
new file mode 100644
index 000000000..987d5406e
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboBoxUI$PropertyChangeHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboBoxUI$PropertyChangeHandler__
+#define __javax_swing_plaf_basic_BasicComboBoxUI$PropertyChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboBoxUI;
+            class BasicComboBoxUI$PropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboBoxUI$PropertyChangeHandler : public ::java::lang::Object
+{
+
+public:
+  BasicComboBoxUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicComboBoxUI *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicComboBoxUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboBoxUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxUI.h b/libjava/javax/swing/plaf/basic/BasicComboBoxUI.h
new file mode 100644
index 000000000..77f1f53d4
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboBoxUI.h
@@ -0,0 +1,154 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboBoxUI__
+#define __javax_swing_plaf_basic_BasicComboBoxUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComboBoxUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Dimension;
+        class Graphics;
+        class Insets;
+        class LayoutManager;
+        class Rectangle;
+      namespace event
+      {
+          class FocusListener;
+          class ItemListener;
+          class KeyListener;
+          class MouseListener;
+          class MouseMotionListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class CellRendererPane;
+        class ComboBoxEditor;
+        class JButton;
+        class JComboBox;
+        class JComponent;
+        class JList;
+        class ListCellRenderer;
+      namespace event
+      {
+          class ListDataListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicComboBoxUI;
+            class ComboPopup;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboBoxUI : public ::javax::swing::plaf::ComboBoxUI
+{
+
+public:
+  BasicComboBoxUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installDefaults();
+  virtual void installListeners();
+  virtual void uninstallDefaults();
+  virtual void uninstallListeners();
+  virtual ::javax::swing::plaf::basic::ComboPopup * createPopup();
+  virtual ::java::awt::event::KeyListener * createKeyListener();
+  virtual ::java::awt::event::FocusListener * createFocusListener();
+  virtual ::javax::swing::event::ListDataListener * createListDataListener();
+  virtual ::java::awt::event::ItemListener * createItemListener();
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
+  virtual ::java::awt::LayoutManager * createLayoutManager();
+  virtual ::javax::swing::ListCellRenderer * createRenderer();
+  virtual ::javax::swing::ComboBoxEditor * createEditor();
+  virtual void installComponents();
+  virtual void uninstallComponents();
+public:
+  virtual void addEditor();
+  virtual void removeEditor();
+public: // actually protected
+  virtual void configureEditor();
+  virtual void unconfigureEditor();
+public:
+  virtual void configureArrowButton();
+  virtual void unconfigureArrowButton();
+public: // actually protected
+  virtual ::javax::swing::JButton * createArrowButton();
+public:
+  virtual jboolean isPopupVisible(::javax::swing::JComboBox *);
+  virtual void setPopupVisible(::javax::swing::JComboBox *, jboolean);
+  virtual jboolean isFocusTraversable(::javax::swing::JComboBox *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  virtual jboolean isNavigationKey(jint);
+  virtual void selectNextPossibleValue();
+  virtual void selectPreviousPossibleValue();
+  virtual void toggleOpenClose();
+  virtual ::java::awt::Rectangle * rectangleForCurrentValue();
+  virtual ::java::awt::Insets * getInsets();
+public:
+  virtual void paintCurrentValue(::java::awt::Graphics *, ::java::awt::Rectangle *, jboolean);
+  virtual void paintCurrentValueBackground(::java::awt::Graphics *, ::java::awt::Rectangle *, jboolean);
+public: // actually protected
+  virtual ::java::awt::Dimension * getDefaultSize();
+  virtual ::java::awt::Dimension * getDisplaySize();
+  virtual void installKeyboardActions();
+  virtual void uninstallKeyboardActions();
+  ::javax::swing::JButton * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ComboBoxUI)))) arrowButton;
+  ::javax::swing::JComboBox * comboBox;
+  ::java::awt::Component * editor;
+  ::java::awt::event::FocusListener * focusListener;
+  jboolean hasFocus;
+  ::java::awt::event::ItemListener * itemListener;
+  ::java::awt::event::KeyListener * keyListener;
+  ::javax::swing::JList * listBox;
+  ::javax::swing::event::ListDataListener * listDataListener;
+  ::javax::swing::plaf::basic::ComboPopup * popup;
+  ::java::awt::event::KeyListener * popupKeyListener;
+  ::java::awt::event::MouseListener * popupMouseListener;
+  ::java::awt::event::MouseMotionListener * popupMouseMotionListener;
+  ::java::beans::PropertyChangeListener * propertyChangeListener;
+public: // actually package-private
+  ::java::awt::Dimension * displaySize;
+public: // actually protected
+  ::javax::swing::CellRendererPane * currentValuePane;
+  ::java::awt::Dimension * cachedMinimumSize;
+  jboolean isMinimumSizeDirty;
+private:
+  static ::javax::swing::ListCellRenderer * DEFAULT_RENDERER;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboBoxUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationKeyHandler.h b/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationKeyHandler.h
new file mode 100644
index 000000000..ecf7e1b8e
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationKeyHandler.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboPopup$InvocationKeyHandler__
+#define __javax_swing_plaf_basic_BasicComboPopup$InvocationKeyHandler__
+
+#pragma interface
+
+#include <java/awt/event/KeyAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class KeyEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboPopup;
+            class BasicComboPopup$InvocationKeyHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboPopup$InvocationKeyHandler : public ::java::awt::event::KeyAdapter
+{
+
+public:
+  BasicComboPopup$InvocationKeyHandler(::javax::swing::plaf::basic::BasicComboPopup *);
+  virtual void keyReleased(::java::awt::event::KeyEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicComboPopup * __attribute__((aligned(__alignof__( ::java::awt::event::KeyAdapter)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboPopup$InvocationKeyHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationMouseHandler.h b/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationMouseHandler.h
new file mode 100644
index 000000000..b04fb475d
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationMouseHandler.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboPopup$InvocationMouseHandler__
+#define __javax_swing_plaf_basic_BasicComboPopup$InvocationMouseHandler__
+
+#pragma interface
+
+#include <java/awt/event/MouseAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboPopup;
+            class BasicComboPopup$InvocationMouseHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboPopup$InvocationMouseHandler : public ::java::awt::event::MouseAdapter
+{
+
+public: // actually protected
+  BasicComboPopup$InvocationMouseHandler(::javax::swing::plaf::basic::BasicComboPopup *);
+public:
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicComboPopup * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboPopup$InvocationMouseHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationMouseMotionHandler.h b/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationMouseMotionHandler.h
new file mode 100644
index 000000000..b8c7bae47
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationMouseMotionHandler.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboPopup$InvocationMouseMotionHandler__
+#define __javax_swing_plaf_basic_BasicComboPopup$InvocationMouseMotionHandler__
+
+#pragma interface
+
+#include <java/awt/event/MouseMotionAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboPopup;
+            class BasicComboPopup$InvocationMouseMotionHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboPopup$InvocationMouseMotionHandler : public ::java::awt::event::MouseMotionAdapter
+{
+
+public: // actually protected
+  BasicComboPopup$InvocationMouseMotionHandler(::javax::swing::plaf::basic::BasicComboPopup *);
+public:
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicComboPopup * __attribute__((aligned(__alignof__( ::java::awt::event::MouseMotionAdapter)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboPopup$InvocationMouseMotionHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup$ItemHandler.h b/libjava/javax/swing/plaf/basic/BasicComboPopup$ItemHandler.h
new file mode 100644
index 000000000..017c66bce
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboPopup$ItemHandler.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboPopup$ItemHandler__
+#define __javax_swing_plaf_basic_BasicComboPopup$ItemHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ItemEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboPopup;
+            class BasicComboPopup$ItemHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboPopup$ItemHandler : public ::java::lang::Object
+{
+
+public: // actually protected
+  BasicComboPopup$ItemHandler(::javax::swing::plaf::basic::BasicComboPopup *);
+public:
+  virtual void itemStateChanged(::java::awt::event::ItemEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicComboPopup * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboPopup$ItemHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup$ListDataHandler.h b/libjava/javax/swing/plaf/basic/BasicComboPopup$ListDataHandler.h
new file mode 100644
index 000000000..d7924a453
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboPopup$ListDataHandler.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboPopup$ListDataHandler__
+#define __javax_swing_plaf_basic_BasicComboPopup$ListDataHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ListDataEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboPopup;
+            class BasicComboPopup$ListDataHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboPopup$ListDataHandler : public ::java::lang::Object
+{
+
+public:
+  BasicComboPopup$ListDataHandler(::javax::swing::plaf::basic::BasicComboPopup *);
+  virtual void contentsChanged(::javax::swing::event::ListDataEvent *);
+  virtual void intervalAdded(::javax::swing::event::ListDataEvent *);
+  virtual void intervalRemoved(::javax::swing::event::ListDataEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicComboPopup * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboPopup$ListDataHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup$ListMouseHandler.h b/libjava/javax/swing/plaf/basic/BasicComboPopup$ListMouseHandler.h
new file mode 100644
index 000000000..84b748854
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboPopup$ListMouseHandler.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboPopup$ListMouseHandler__
+#define __javax_swing_plaf_basic_BasicComboPopup$ListMouseHandler__
+
+#pragma interface
+
+#include <java/awt/event/MouseAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboPopup;
+            class BasicComboPopup$ListMouseHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboPopup$ListMouseHandler : public ::java::awt::event::MouseAdapter
+{
+
+public: // actually protected
+  BasicComboPopup$ListMouseHandler(::javax::swing::plaf::basic::BasicComboPopup *);
+public:
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicComboPopup * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboPopup$ListMouseHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup$ListMouseMotionHandler.h b/libjava/javax/swing/plaf/basic/BasicComboPopup$ListMouseMotionHandler.h
new file mode 100644
index 000000000..d772569ba
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboPopup$ListMouseMotionHandler.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboPopup$ListMouseMotionHandler__
+#define __javax_swing_plaf_basic_BasicComboPopup$ListMouseMotionHandler__
+
+#pragma interface
+
+#include <java/awt/event/MouseMotionAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboPopup;
+            class BasicComboPopup$ListMouseMotionHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboPopup$ListMouseMotionHandler : public ::java::awt::event::MouseMotionAdapter
+{
+
+public: // actually protected
+  BasicComboPopup$ListMouseMotionHandler(::javax::swing::plaf::basic::BasicComboPopup *);
+public:
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicComboPopup * __attribute__((aligned(__alignof__( ::java::awt::event::MouseMotionAdapter)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboPopup$ListMouseMotionHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup$ListSelectionHandler.h b/libjava/javax/swing/plaf/basic/BasicComboPopup$ListSelectionHandler.h
new file mode 100644
index 000000000..dd3caad10
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboPopup$ListSelectionHandler.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboPopup$ListSelectionHandler__
+#define __javax_swing_plaf_basic_BasicComboPopup$ListSelectionHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ListSelectionEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboPopup;
+            class BasicComboPopup$ListSelectionHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboPopup$ListSelectionHandler : public ::java::lang::Object
+{
+
+public: // actually protected
+  BasicComboPopup$ListSelectionHandler(::javax::swing::plaf::basic::BasicComboPopup *);
+public:
+  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicComboPopup * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboPopup$ListSelectionHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicComboPopup$PropertyChangeHandler.h
new file mode 100644
index 000000000..5bff9aa4c
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboPopup$PropertyChangeHandler.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboPopup$PropertyChangeHandler__
+#define __javax_swing_plaf_basic_BasicComboPopup$PropertyChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboPopup;
+            class BasicComboPopup$PropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboPopup$PropertyChangeHandler : public ::java::lang::Object
+{
+
+public: // actually protected
+  BasicComboPopup$PropertyChangeHandler(::javax::swing::plaf::basic::BasicComboPopup *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicComboPopup * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboPopup$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup.h b/libjava/javax/swing/plaf/basic/BasicComboPopup.h
new file mode 100644
index 000000000..7dfc52506
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicComboPopup.h
@@ -0,0 +1,133 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicComboPopup__
+#define __javax_swing_plaf_basic_BasicComboPopup__
+
+#pragma interface
+
+#include <javax/swing/JPopupMenu.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Rectangle;
+      namespace event
+      {
+          class ItemListener;
+          class KeyListener;
+          class MouseEvent;
+          class MouseListener;
+          class MouseMotionListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ComboBoxModel;
+        class JComboBox;
+        class JList;
+        class JScrollPane;
+        class Timer;
+      namespace event
+      {
+          class ListDataListener;
+          class ListSelectionListener;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicComboPopup;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicComboPopup : public ::javax::swing::JPopupMenu
+{
+
+public:
+  BasicComboPopup(::javax::swing::JComboBox *);
+  virtual void show();
+  virtual void hide();
+  virtual ::javax::swing::JList * getList();
+  virtual ::java::awt::event::MouseListener * getMouseListener();
+  virtual ::java::awt::event::MouseMotionListener * getMouseMotionListener();
+  virtual ::java::awt::event::KeyListener * getKeyListener();
+  virtual void uninstallingUI();
+public: // actually protected
+  virtual void uninstallComboBoxModelListeners(::javax::swing::ComboBoxModel *);
+  virtual void uninstallKeyboardActions();
+  virtual void firePopupMenuWillBecomeVisible();
+  virtual void firePopupMenuWillBecomeInvisible();
+  virtual void firePopupMenuCanceled();
+  virtual ::java::awt::event::MouseListener * createMouseListener();
+  virtual ::java::awt::event::MouseMotionListener * createMouseMotionListener();
+  virtual ::java::awt::event::KeyListener * createKeyListener();
+  virtual ::javax::swing::event::ListSelectionListener * createListSelectionListener();
+  virtual ::javax::swing::event::ListDataListener * createListDataListener();
+  virtual ::java::awt::event::MouseListener * createListMouseListener();
+  virtual ::java::awt::event::MouseMotionListener * createListMouseMotionListener();
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
+  virtual ::java::awt::event::ItemListener * createItemListener();
+  virtual ::javax::swing::JList * createList();
+  virtual void configureList();
+  virtual void installListListeners();
+  virtual ::javax::swing::JScrollPane * createScroller();
+  virtual void configureScroller();
+  virtual void configurePopup();
+  virtual void installComboBoxListeners();
+  virtual void installComboBoxModelListeners(::javax::swing::ComboBoxModel *);
+  virtual void installKeyboardActions();
+public:
+  virtual jboolean isFocusTraversable();
+public: // actually protected
+  virtual void startAutoScrolling(jint);
+  virtual void stopAutoScrolling();
+  virtual void autoScrollUp();
+  virtual void autoScrollDown();
+  virtual void delegateFocus(::java::awt::event::MouseEvent *);
+  virtual void togglePopup();
+  virtual ::java::awt::event::MouseEvent * convertMouseEvent(::java::awt::event::MouseEvent *);
+  virtual jint getPopupHeightForRowCount(jint);
+  virtual ::java::awt::Rectangle * computePopupBounds(jint, jint, jint, jint);
+  virtual void updateListBoxSelectionForEvent(::java::awt::event::MouseEvent *, jboolean);
+private:
+  void uninstallListListeners();
+public: // actually package-private
+  virtual void syncListSelection();
+public: // actually protected
+  ::javax::swing::Timer * __attribute__((aligned(__alignof__( ::javax::swing::JPopupMenu)))) autoscrollTimer;
+  ::javax::swing::JComboBox * comboBox;
+  jboolean hasEntered;
+  jboolean isAutoScrolling;
+  ::java::awt::event::ItemListener * itemListener;
+  ::java::awt::event::KeyListener * keyListener;
+  ::javax::swing::JList * list;
+  ::javax::swing::event::ListDataListener * listDataListener;
+  ::java::awt::event::MouseListener * listMouseListener;
+  ::java::awt::event::MouseMotionListener * listMouseMotionListener;
+  ::javax::swing::event::ListSelectionListener * listSelectionListener;
+  ::java::awt::event::MouseListener * mouseListener;
+  ::java::awt::event::MouseMotionListener * mouseMotionListener;
+  ::java::beans::PropertyChangeListener * propertyChangeListener;
+  static const jint SCROLL_DOWN = 1;
+  static const jint SCROLL_UP = 0;
+  jint scrollDirection;
+  ::javax::swing::JScrollPane * scroller;
+  jboolean valueIsAdjusting;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicComboPopup__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$1.h b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$1.h
new file mode 100644
index 000000000..1be1e4ca3
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$1.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicDesktopIconUI$1__
+#define __javax_swing_plaf_basic_BasicDesktopIconUI$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicDesktopIconUI;
+            class BasicDesktopIconUI$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicDesktopIconUI$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicDesktopIconUI$1(::javax::swing::plaf::basic::BasicDesktopIconUI *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicDesktopIconUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicDesktopIconUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$2.h b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$2.h
new file mode 100644
index 000000000..cfa445f11
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$2.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicDesktopIconUI$2__
+#define __javax_swing_plaf_basic_BasicDesktopIconUI$2__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicDesktopIconUI;
+            class BasicDesktopIconUI$2;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicDesktopIconUI$2 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicDesktopIconUI$2(::javax::swing::plaf::basic::BasicDesktopIconUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicDesktopIconUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicDesktopIconUI$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$BoundButton.h b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$BoundButton.h
new file mode 100644
index 000000000..7a6787144
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$BoundButton.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicDesktopIconUI$BoundButton__
+#define __javax_swing_plaf_basic_BasicDesktopIconUI$BoundButton__
+
+#pragma interface
+
+#include <javax/swing/JButton.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicDesktopIconUI;
+            class BasicDesktopIconUI$BoundButton;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicDesktopIconUI$BoundButton : public ::javax::swing::JButton
+{
+
+public:
+  BasicDesktopIconUI$BoundButton(::javax::swing::plaf::basic::BasicDesktopIconUI *, ::java::lang::String *);
+  virtual ::java::awt::Dimension * getPreferredSize();
+  virtual ::java::awt::Dimension * getMinimumSize();
+  virtual ::java::awt::Dimension * getMaximumSize();
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicDesktopIconUI * __attribute__((aligned(__alignof__( ::javax::swing::JButton)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicDesktopIconUI$BoundButton__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$DesktopIconBorder.h b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$DesktopIconBorder.h
new file mode 100644
index 000000000..cfce73806
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$DesktopIconBorder.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicDesktopIconUI$DesktopIconBorder__
+#define __javax_swing_plaf_basic_BasicDesktopIconUI$DesktopIconBorder__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicDesktopIconUI;
+            class BasicDesktopIconUI$DesktopIconBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicDesktopIconUI$DesktopIconBorder : public ::java::lang::Object
+{
+
+  BasicDesktopIconUI$DesktopIconBorder(::javax::swing::plaf::basic::BasicDesktopIconUI *);
+public:
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual jboolean isBorderOpaque();
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+public: // actually package-private
+  BasicDesktopIconUI$DesktopIconBorder(::javax::swing::plaf::basic::BasicDesktopIconUI *, ::javax::swing::plaf::basic::BasicDesktopIconUI$DesktopIconBorder *);
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) left;
+  jint top;
+  jint right;
+  jint bottom;
+  ::javax::swing::plaf::basic::BasicDesktopIconUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicDesktopIconUI$DesktopIconBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$InternalFrameDefaultMenuIcon.h b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$InternalFrameDefaultMenuIcon.h
new file mode 100644
index 000000000..4a53e9a62
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$InternalFrameDefaultMenuIcon.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicDesktopIconUI$InternalFrameDefaultMenuIcon__
+#define __javax_swing_plaf_basic_BasicDesktopIconUI$InternalFrameDefaultMenuIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicDesktopIconUI$InternalFrameDefaultMenuIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicDesktopIconUI$InternalFrameDefaultMenuIcon : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicDesktopIconUI$InternalFrameDefaultMenuIcon();
+public:
+  virtual jint getIconHeight();
+  virtual jint getIconWidth();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicDesktopIconUI$InternalFrameDefaultMenuIcon__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$MouseInputHandler.h b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$MouseInputHandler.h
new file mode 100644
index 000000000..0829e1ff9
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$MouseInputHandler.h
@@ -0,0 +1,60 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicDesktopIconUI$MouseInputHandler__
+#define __javax_swing_plaf_basic_BasicDesktopIconUI$MouseInputHandler__
+
+#pragma interface
+
+#include <javax/swing/event/MouseInputAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class JDesktopPane;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicDesktopIconUI;
+            class BasicDesktopIconUI$MouseInputHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicDesktopIconUI$MouseInputHandler : public ::javax::swing::event::MouseInputAdapter
+{
+
+public:
+  BasicDesktopIconUI$MouseInputHandler(::javax::swing::plaf::basic::BasicDesktopIconUI *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+  virtual void moveAndRepaint(::javax::swing::JComponent *, jint, jint, jint, jint);
+private:
+  jint __attribute__((aligned(__alignof__( ::javax::swing::event::MouseInputAdapter)))) xOffset;
+  jint yOffset;
+  ::javax::swing::JDesktopPane * pane;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicDesktopIconUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicDesktopIconUI$MouseInputHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI.h b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI.h
new file mode 100644
index 000000000..bafff1a06
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI.h
@@ -0,0 +1,90 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicDesktopIconUI__
+#define __javax_swing_plaf_basic_BasicDesktopIconUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/DesktopIconUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Insets;
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+        class JComponent;
+        class JInternalFrame;
+        class JInternalFrame$JDesktopIcon;
+      namespace event
+      {
+          class MouseInputListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicDesktopIconUI;
+            class BasicDesktopIconUI$BoundButton;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicDesktopIconUI : public ::javax::swing::plaf::DesktopIconUI
+{
+
+public:
+  BasicDesktopIconUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installComponents();
+  virtual void uninstallComponents();
+  virtual void installListeners();
+  virtual void uninstallListeners();
+  virtual void installDefaults();
+  virtual void uninstallDefaults();
+  virtual ::javax::swing::event::MouseInputListener * createMouseInputListener();
+public:
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Insets * getInsets(::javax::swing::JComponent *);
+  virtual void deiconize();
+private:
+  static const jint iconSize = 16;
+  static const jint iconWidth = 160;
+  static const jint iconHeight = 35;
+public: // actually protected
+  ::javax::swing::JInternalFrame$JDesktopIcon * __attribute__((aligned(__alignof__( ::javax::swing::plaf::DesktopIconUI)))) desktopIcon;
+  ::javax::swing::JInternalFrame * frame;
+private:
+  ::javax::swing::event::MouseInputListener * mouseHandler;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicDesktopIconUI$BoundButton * button;
+private:
+  ::java::beans::PropertyChangeListener * propertyHandler;
+public: // actually package-private
+  static ::javax::swing::Icon * defaultIcon;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicDesktopIconUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$CloseAction.h b/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$CloseAction.h
new file mode 100644
index 000000000..da7e843ab
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$CloseAction.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicDesktopPaneUI$CloseAction__
+#define __javax_swing_plaf_basic_BasicDesktopPaneUI$CloseAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicDesktopPaneUI;
+            class BasicDesktopPaneUI$CloseAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicDesktopPaneUI$CloseAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually protected
+  BasicDesktopPaneUI$CloseAction(::javax::swing::plaf::basic::BasicDesktopPaneUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual jboolean isEnabled();
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicDesktopPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicDesktopPaneUI$CloseAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$MaximizeAction.h b/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$MaximizeAction.h
new file mode 100644
index 000000000..2733cec79
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$MaximizeAction.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicDesktopPaneUI$MaximizeAction__
+#define __javax_swing_plaf_basic_BasicDesktopPaneUI$MaximizeAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicDesktopPaneUI;
+            class BasicDesktopPaneUI$MaximizeAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicDesktopPaneUI$MaximizeAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually protected
+  BasicDesktopPaneUI$MaximizeAction(::javax::swing::plaf::basic::BasicDesktopPaneUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual jboolean isEnabled();
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicDesktopPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicDesktopPaneUI$MaximizeAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$MinimizeAction.h b/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$MinimizeAction.h
new file mode 100644
index 000000000..c834c71de
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$MinimizeAction.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicDesktopPaneUI$MinimizeAction__
+#define __javax_swing_plaf_basic_BasicDesktopPaneUI$MinimizeAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicDesktopPaneUI;
+            class BasicDesktopPaneUI$MinimizeAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicDesktopPaneUI$MinimizeAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually protected
+  BasicDesktopPaneUI$MinimizeAction(::javax::swing::plaf::basic::BasicDesktopPaneUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual jboolean isEnabled();
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicDesktopPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicDesktopPaneUI$MinimizeAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$NavigateAction.h b/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$NavigateAction.h
new file mode 100644
index 000000000..b327f1cb3
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$NavigateAction.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicDesktopPaneUI$NavigateAction__
+#define __javax_swing_plaf_basic_BasicDesktopPaneUI$NavigateAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicDesktopPaneUI;
+            class BasicDesktopPaneUI$NavigateAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicDesktopPaneUI$NavigateAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually protected
+  BasicDesktopPaneUI$NavigateAction(::javax::swing::plaf::basic::BasicDesktopPaneUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual jboolean isEnabled();
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicDesktopPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicDesktopPaneUI$NavigateAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$OpenAction.h b/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$OpenAction.h
new file mode 100644
index 000000000..0fc733b6f
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$OpenAction.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicDesktopPaneUI$OpenAction__
+#define __javax_swing_plaf_basic_BasicDesktopPaneUI$OpenAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicDesktopPaneUI;
+            class BasicDesktopPaneUI$OpenAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicDesktopPaneUI$OpenAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually protected
+  BasicDesktopPaneUI$OpenAction(::javax::swing::plaf::basic::BasicDesktopPaneUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual jboolean isEnabled();
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicDesktopPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicDesktopPaneUI$OpenAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI.h b/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI.h
new file mode 100644
index 000000000..c67ca088d
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI.h
@@ -0,0 +1,74 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicDesktopPaneUI__
+#define __javax_swing_plaf_basic_BasicDesktopPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/DesktopPaneUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class DesktopManager;
+        class JComponent;
+        class JDesktopPane;
+        class KeyStroke;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicDesktopPaneUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicDesktopPaneUI : public ::javax::swing::plaf::DesktopPaneUI
+{
+
+public:
+  BasicDesktopPaneUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installDefaults();
+  virtual void installDesktopManager();
+  virtual void installKeyboardActions();
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void registerKeyboardActions();
+  virtual void uninstallDefaults();
+  virtual void uninstallDesktopManager();
+  virtual void uninstallKeyboardActions();
+  virtual void unregisterKeyboardActions();
+public:
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  ::javax::swing::KeyStroke * __attribute__((aligned(__alignof__( ::javax::swing::plaf::DesktopPaneUI)))) closeKey;
+  ::javax::swing::KeyStroke * maximizeKey;
+  ::javax::swing::KeyStroke * minimizeKey;
+  ::javax::swing::KeyStroke * navigateKey;
+  ::javax::swing::KeyStroke * navigateKey2;
+  ::javax::swing::DesktopManager * desktopManager;
+  ::javax::swing::JDesktopPane * desktop;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicDesktopPaneUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicDirectoryModel$1.h b/libjava/javax/swing/plaf/basic/BasicDirectoryModel$1.h
new file mode 100644
index 000000000..a9daf9bc7
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicDirectoryModel$1.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicDirectoryModel$1__
+#define __javax_swing_plaf_basic_BasicDirectoryModel$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicDirectoryModel;
+            class BasicDirectoryModel$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicDirectoryModel$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicDirectoryModel$1(::javax::swing::plaf::basic::BasicDirectoryModel *);
+public:
+  virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicDirectoryModel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicDirectoryModel$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest.h b/libjava/javax/swing/plaf/basic/BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest.h
new file mode 100644
index 000000000..a5d2a719d
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest__
+#define __javax_swing_plaf_basic_BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicDirectoryModel$DirectoryLoadThread;
+            class BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest(::javax::swing::plaf::basic::BasicDirectoryModel$DirectoryLoadThread *, ::java::util::List *, jint, ::java::util::List *, jint);
+public:
+  virtual void run();
+public: // actually package-private
+  virtual void cancel();
+private:
+  ::java::util::List * __attribute__((aligned(__alignof__( ::java::lang::Object)))) added;
+  jint addIndex;
+  ::java::util::List * removed;
+  jint removeIndex;
+  jboolean cancel__;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicDirectoryModel$DirectoryLoadThread * this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest__
diff --git a/libjava/javax/swing/plaf/basic/BasicDirectoryModel$DirectoryLoadThread.h b/libjava/javax/swing/plaf/basic/BasicDirectoryModel$DirectoryLoadThread.h
new file mode 100644
index 000000000..d20f830c2
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicDirectoryModel$DirectoryLoadThread.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicDirectoryModel$DirectoryLoadThread__
+#define __javax_swing_plaf_basic_BasicDirectoryModel$DirectoryLoadThread__
+
+#pragma interface
+
+#include <java/lang/Thread.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicDirectoryModel;
+            class BasicDirectoryModel$DirectoryLoadThread;
+            class BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicDirectoryModel$DirectoryLoadThread : public ::java::lang::Thread
+{
+
+public: // actually package-private
+  BasicDirectoryModel$DirectoryLoadThread(::javax::swing::plaf::basic::BasicDirectoryModel *, ::java::io::File *);
+public:
+  virtual void run();
+private:
+  void invokeLater(::javax::swing::plaf::basic::BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest *);
+public: // actually package-private
+  virtual void cancelPending();
+  static ::javax::swing::plaf::basic::BasicDirectoryModel * access$0(::javax::swing::plaf::basic::BasicDirectoryModel$DirectoryLoadThread *);
+  ::java::io::File * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) directory;
+private:
+  ::javax::swing::plaf::basic::BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest * pending;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicDirectoryModel * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicDirectoryModel$DirectoryLoadThread__
diff --git a/libjava/javax/swing/plaf/basic/BasicDirectoryModel.h b/libjava/javax/swing/plaf/basic/BasicDirectoryModel.h
new file mode 100644
index 000000000..f13550f71
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicDirectoryModel.h
@@ -0,0 +1,83 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicDirectoryModel__
+#define __javax_swing_plaf_basic_BasicDirectoryModel__
+
+#pragma interface
+
+#include <javax/swing/AbstractListModel.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JFileChooser;
+      namespace event
+      {
+          class ListDataEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicDirectoryModel;
+            class BasicDirectoryModel$DirectoryLoadThread;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicDirectoryModel : public ::javax::swing::AbstractListModel
+{
+
+public:
+  BasicDirectoryModel(::javax::swing::JFileChooser *);
+  virtual jboolean contains(::java::lang::Object *);
+  virtual void fireContentsChanged();
+  virtual ::java::util::Vector * getDirectories();
+  virtual ::java::lang::Object * getElementAt(jint);
+  virtual ::java::util::Vector * getFiles();
+  virtual jint getSize();
+  virtual jint indexOf(::java::lang::Object *);
+  virtual void intervalAdded(::javax::swing::event::ListDataEvent *);
+  virtual void intervalRemoved(::javax::swing::event::ListDataEvent *);
+  virtual void invalidateFileCache();
+public: // actually protected
+  virtual jboolean lt(::java::io::File *, ::java::io::File *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+  virtual jboolean renameFile(::java::io::File *, ::java::io::File *);
+public: // actually protected
+  virtual void sort(::java::util::Vector *);
+public:
+  virtual void validateFileCache();
+public: // actually package-private
+  static ::java::util::Vector * access$0(::javax::swing::plaf::basic::BasicDirectoryModel *);
+  static void access$1(::javax::swing::plaf::basic::BasicDirectoryModel *, ::java::util::Vector *);
+  static void access$2(::javax::swing::plaf::basic::BasicDirectoryModel *, ::java::util::Vector *);
+  static void access$3(::javax::swing::plaf::basic::BasicDirectoryModel *, ::java::lang::Object *, jint, jint);
+  static void access$4(::javax::swing::plaf::basic::BasicDirectoryModel *, ::java::lang::Object *, jint, jint);
+  static ::javax::swing::JFileChooser * access$5(::javax::swing::plaf::basic::BasicDirectoryModel *);
+private:
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::AbstractListModel)))) contents;
+  ::java::util::Vector * directories;
+  ::java::util::Vector * files;
+  jint listingMode;
+  ::javax::swing::JFileChooser * filechooser;
+  ::javax::swing::plaf::basic::BasicDirectoryModel$DirectoryLoadThread * loadThread;
+  ::java::util::Comparator * comparator;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicDirectoryModel__
diff --git a/libjava/javax/swing/plaf/basic/BasicEditorPaneUI.h b/libjava/javax/swing/plaf/basic/BasicEditorPaneUI.h
new file mode 100644
index 000000000..b0033edb1
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicEditorPaneUI.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicEditorPaneUI__
+#define __javax_swing_plaf_basic_BasicEditorPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicTextUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicEditorPaneUI;
+        }
+      }
+      namespace text
+      {
+          class EditorKit;
+          class JTextComponent;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicEditorPaneUI : public ::javax::swing::plaf::basic::BasicTextUI
+{
+
+public:
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  BasicEditorPaneUI();
+public: // actually protected
+  virtual ::java::lang::String * getPropertyPrefix();
+public:
+  virtual ::javax::swing::text::EditorKit * getEditorKit(::javax::swing::text::JTextComponent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicEditorPaneUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$AcceptAllFileFilter.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$AcceptAllFileFilter.h
new file mode 100644
index 000000000..72434cc64
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$AcceptAllFileFilter.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$AcceptAllFileFilter__
+#define __javax_swing_plaf_basic_BasicFileChooserUI$AcceptAllFileFilter__
+
+#pragma interface
+
+#include <javax/swing/filechooser/FileFilter.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicFileChooserUI;
+            class BasicFileChooserUI$AcceptAllFileFilter;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicFileChooserUI$AcceptAllFileFilter : public ::javax::swing::filechooser::FileFilter
+{
+
+public:
+  BasicFileChooserUI$AcceptAllFileFilter(::javax::swing::plaf::basic::BasicFileChooserUI *);
+  virtual jboolean accept(::java::io::File *);
+  virtual ::java::lang::String * getDescription();
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::filechooser::FileFilter)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicFileChooserUI$AcceptAllFileFilter__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$ApproveSelectionAction.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$ApproveSelectionAction.h
new file mode 100644
index 000000000..b650369be
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$ApproveSelectionAction.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$ApproveSelectionAction__
+#define __javax_swing_plaf_basic_BasicFileChooserUI$ApproveSelectionAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicFileChooserUI;
+            class BasicFileChooserUI$ApproveSelectionAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicFileChooserUI$ApproveSelectionAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually protected
+  BasicFileChooserUI$ApproveSelectionAction(::javax::swing::plaf::basic::BasicFileChooserUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicFileChooserUI$ApproveSelectionAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$BasicFileView.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$BasicFileView.h
new file mode 100644
index 000000000..dece5a2e9
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$BasicFileView.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$BasicFileView__
+#define __javax_swing_plaf_basic_BasicFileChooserUI$BasicFileView__
+
+#pragma interface
+
+#include <javax/swing/filechooser/FileView.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicFileChooserUI;
+            class BasicFileChooserUI$BasicFileView;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicFileChooserUI$BasicFileView : public ::javax::swing::filechooser::FileView
+{
+
+public:
+  BasicFileChooserUI$BasicFileView(::javax::swing::plaf::basic::BasicFileChooserUI *);
+  virtual void cacheIcon(::java::io::File *, ::javax::swing::Icon *);
+  virtual void clearIconCache();
+  virtual ::javax::swing::Icon * getCachedIcon(::java::io::File *);
+  virtual ::java::lang::String * getDescription(::java::io::File *);
+  virtual ::javax::swing::Icon * getIcon(::java::io::File *);
+  virtual ::java::lang::String * getName(::java::io::File *);
+  virtual ::java::lang::String * getTypeDescription(::java::io::File *);
+  virtual ::java::lang::Boolean * isHidden(::java::io::File *);
+public: // actually protected
+  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::javax::swing::filechooser::FileView)))) iconCache;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicFileChooserUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicFileChooserUI$BasicFileView__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$CancelSelectionAction.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$CancelSelectionAction.h
new file mode 100644
index 000000000..03af702d3
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$CancelSelectionAction.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$CancelSelectionAction__
+#define __javax_swing_plaf_basic_BasicFileChooserUI$CancelSelectionAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicFileChooserUI;
+            class BasicFileChooserUI$CancelSelectionAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicFileChooserUI$CancelSelectionAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually protected
+  BasicFileChooserUI$CancelSelectionAction(::javax::swing::plaf::basic::BasicFileChooserUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicFileChooserUI$CancelSelectionAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$ChangeToParentDirectoryAction.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$ChangeToParentDirectoryAction.h
new file mode 100644
index 000000000..75b99b56b
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$ChangeToParentDirectoryAction.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$ChangeToParentDirectoryAction__
+#define __javax_swing_plaf_basic_BasicFileChooserUI$ChangeToParentDirectoryAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicFileChooserUI;
+            class BasicFileChooserUI$ChangeToParentDirectoryAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicFileChooserUI$ChangeToParentDirectoryAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually protected
+  BasicFileChooserUI$ChangeToParentDirectoryAction(::javax::swing::plaf::basic::BasicFileChooserUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicFileChooserUI$ChangeToParentDirectoryAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$DoubleClickListener.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$DoubleClickListener.h
new file mode 100644
index 000000000..79df99205
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$DoubleClickListener.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$DoubleClickListener__
+#define __javax_swing_plaf_basic_BasicFileChooserUI$DoubleClickListener__
+
+#pragma interface
+
+#include <java/awt/event/MouseAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JList;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicFileChooserUI;
+            class BasicFileChooserUI$DoubleClickListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicFileChooserUI$DoubleClickListener : public ::java::awt::event::MouseAdapter
+{
+
+public:
+  BasicFileChooserUI$DoubleClickListener(::javax::swing::plaf::basic::BasicFileChooserUI *, ::javax::swing::JList *);
+  virtual void mouseClicked(::java::awt::event::MouseEvent *);
+  virtual void mouseEntered(::java::awt::event::MouseEvent *);
+private:
+  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) lastSelected;
+  ::javax::swing::JList * list;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicFileChooserUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicFileChooserUI$DoubleClickListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$GoHomeAction.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$GoHomeAction.h
new file mode 100644
index 000000000..219143eb5
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$GoHomeAction.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$GoHomeAction__
+#define __javax_swing_plaf_basic_BasicFileChooserUI$GoHomeAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicFileChooserUI;
+            class BasicFileChooserUI$GoHomeAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicFileChooserUI$GoHomeAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually protected
+  BasicFileChooserUI$GoHomeAction(::javax::swing::plaf::basic::BasicFileChooserUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicFileChooserUI$GoHomeAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$NewFolderAction.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$NewFolderAction.h
new file mode 100644
index 000000000..da249e43a
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$NewFolderAction.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$NewFolderAction__
+#define __javax_swing_plaf_basic_BasicFileChooserUI$NewFolderAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicFileChooserUI;
+            class BasicFileChooserUI$NewFolderAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicFileChooserUI$NewFolderAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually protected
+  BasicFileChooserUI$NewFolderAction(::javax::swing::plaf::basic::BasicFileChooserUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicFileChooserUI$NewFolderAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$SelectionListener.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$SelectionListener.h
new file mode 100644
index 000000000..af8c2d0ba
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$SelectionListener.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$SelectionListener__
+#define __javax_swing_plaf_basic_BasicFileChooserUI$SelectionListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ListSelectionEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicFileChooserUI;
+            class BasicFileChooserUI$SelectionListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicFileChooserUI$SelectionListener : public ::java::lang::Object
+{
+
+public: // actually protected
+  BasicFileChooserUI$SelectionListener(::javax::swing::plaf::basic::BasicFileChooserUI *);
+public:
+  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicFileChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicFileChooserUI$SelectionListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$UpdateAction.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$UpdateAction.h
new file mode 100644
index 000000000..a3db6b134
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$UpdateAction.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$UpdateAction__
+#define __javax_swing_plaf_basic_BasicFileChooserUI$UpdateAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicFileChooserUI;
+            class BasicFileChooserUI$UpdateAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicFileChooserUI$UpdateAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually protected
+  BasicFileChooserUI$UpdateAction(::javax::swing::plaf::basic::BasicFileChooserUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicFileChooserUI$UpdateAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI.h
new file mode 100644
index 000000000..8565a6757
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicFileChooserUI.h
@@ -0,0 +1,187 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicFileChooserUI__
+#define __javax_swing_plaf_basic_BasicFileChooserUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/FileChooserUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Action;
+        class Icon;
+        class JButton;
+        class JComponent;
+        class JFileChooser;
+        class JList;
+        class JPanel;
+        class JTextField;
+      namespace event
+      {
+          class ListSelectionListener;
+      }
+      namespace filechooser
+      {
+          class FileFilter;
+          class FileView;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicDirectoryModel;
+            class BasicFileChooserUI;
+            class BasicFileChooserUI$ApproveSelectionAction;
+            class BasicFileChooserUI$CancelSelectionAction;
+            class BasicFileChooserUI$ChangeToParentDirectoryAction;
+            class BasicFileChooserUI$GoHomeAction;
+            class BasicFileChooserUI$NewFolderAction;
+            class BasicFileChooserUI$UpdateAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicFileChooserUI : public ::javax::swing::plaf::FileChooserUI
+{
+
+public: // actually package-private
+  virtual void closeDialog();
+public:
+  BasicFileChooserUI(::javax::swing::JFileChooser *);
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually package-private
+  virtual void boxEntries();
+public:
+  virtual void installComponents(::javax::swing::JFileChooser *);
+  virtual void uninstallComponents(::javax::swing::JFileChooser *);
+public: // actually protected
+  virtual void installListeners(::javax::swing::JFileChooser *);
+  virtual void uninstallListeners(::javax::swing::JFileChooser *);
+  virtual void installDefaults(::javax::swing::JFileChooser *);
+  virtual void uninstallDefaults(::javax::swing::JFileChooser *);
+  virtual void installIcons(::javax::swing::JFileChooser *);
+  virtual void uninstallIcons(::javax::swing::JFileChooser *);
+  virtual void installStrings(::javax::swing::JFileChooser *);
+  virtual void uninstallStrings(::javax::swing::JFileChooser *);
+  virtual void createModel();
+public:
+  virtual ::javax::swing::plaf::basic::BasicDirectoryModel * getModel();
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener(::javax::swing::JFileChooser *);
+  virtual ::java::lang::String * getFileName();
+  virtual ::java::lang::String * getDirectoryName();
+  virtual void setFileName(::java::lang::String *);
+  virtual void setDirectoryName(::java::lang::String *);
+  virtual void rescanCurrentDirectory(::javax::swing::JFileChooser *);
+  virtual void ensureFileIsVisible(::javax::swing::JFileChooser *, ::java::io::File *);
+  virtual ::javax::swing::JFileChooser * getFileChooser();
+  virtual ::javax::swing::JPanel * getAccessoryPanel();
+public: // actually protected
+  virtual ::javax::swing::JButton * getApproveButton(::javax::swing::JFileChooser *);
+public:
+  virtual ::java::lang::String * getApproveButtonToolTipText(::javax::swing::JFileChooser *);
+  virtual void clearIconCache();
+  virtual ::javax::swing::event::ListSelectionListener * createListSelectionListener(::javax::swing::JFileChooser *);
+public: // actually protected
+  virtual ::java::awt::event::MouseListener * createDoubleClickListener(::javax::swing::JFileChooser *, ::javax::swing::JList *);
+  virtual jboolean isDirectorySelected();
+  virtual void setDirectorySelected(jboolean);
+  virtual ::java::io::File * getDirectory();
+  virtual void setDirectory(::java::io::File *);
+public:
+  virtual ::javax::swing::filechooser::FileFilter * getAcceptAllFileFilter(::javax::swing::JFileChooser *);
+  virtual ::javax::swing::filechooser::FileView * getFileView(::javax::swing::JFileChooser *);
+  virtual ::java::lang::String * getDialogTitle(::javax::swing::JFileChooser *);
+  virtual jint getApproveButtonMnemonic(::javax::swing::JFileChooser *);
+  virtual ::java::lang::String * getApproveButtonText(::javax::swing::JFileChooser *);
+  virtual ::javax::swing::Action * getNewFolderAction();
+  virtual ::javax::swing::Action * getGoHomeAction();
+  virtual ::javax::swing::Action * getChangeToParentDirectoryAction();
+  virtual ::javax::swing::Action * getApproveSelectionAction();
+  virtual ::javax::swing::Action * getCancelSelectionAction();
+  virtual ::javax::swing::Action * getUpdateAction();
+public: // actually package-private
+  static ::java::io::File * access$0(::javax::swing::plaf::basic::BasicFileChooserUI *);
+  static void access$1(::javax::swing::plaf::basic::BasicFileChooserUI *, ::java::io::File *);
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::javax::swing::plaf::FileChooserUI)))) cancelButtonMnemonic;
+  ::java::lang::String * cancelButtonText;
+  ::java::lang::String * cancelButtonToolTipText;
+  ::javax::swing::Icon * computerIcon;
+  ::javax::swing::Icon * detailsViewIcon;
+  ::javax::swing::Icon * directoryIcon;
+  jint directoryOpenButtonMnemonic;
+  ::java::lang::String * directoryOpenButtonText;
+  ::java::lang::String * directoryOpenButtonToolTipText;
+  ::javax::swing::Icon * fileIcon;
+  ::javax::swing::Icon * floppyDriveIcon;
+  ::javax::swing::Icon * hardDriveIcon;
+  jint helpButtonMnemonic;
+  ::java::lang::String * helpButtonText;
+  ::java::lang::String * helpButtonToolTipText;
+  ::javax::swing::Icon * homeFolderIcon;
+  ::javax::swing::Icon * listViewIcon;
+  ::javax::swing::Icon * newFolderIcon;
+  jint openButtonMnemonic;
+  ::java::lang::String * openButtonText;
+  ::java::lang::String * openButtonToolTipText;
+  jint saveButtonMnemonic;
+  ::java::lang::String * saveButtonText;
+  ::java::lang::String * saveButtonToolTipText;
+  jint updateButtonMnemonic;
+  ::java::lang::String * updateButtonText;
+  ::java::lang::String * updateButtonToolTipText;
+  ::javax::swing::Icon * upFolderIcon;
+public: // actually package-private
+  ::javax::swing::JFileChooser * filechooser;
+  ::javax::swing::plaf::basic::BasicDirectoryModel * model;
+  ::javax::swing::filechooser::FileFilter * acceptAll;
+  ::javax::swing::filechooser::FileView * fv;
+  ::javax::swing::JButton * accept;
+  ::javax::swing::JPanel * accessoryPanel;
+  ::java::beans::PropertyChangeListener * propertyChangeListener;
+  ::java::lang::String * acceptAllFileFilterText;
+  ::java::lang::String * dirDescText;
+  ::java::lang::String * fileDescText;
+  jboolean dirSelected;
+  ::java::io::File * currDir;
+  ::javax::swing::JPanel * bottomPanel;
+  ::javax::swing::JPanel * closePanel;
+  ::javax::swing::JTextField * entry;
+  ::java::lang::String * parentPath;
+private:
+  ::javax::swing::plaf::basic::BasicFileChooserUI$ApproveSelectionAction * approveSelectionAction;
+  ::javax::swing::plaf::basic::BasicFileChooserUI$CancelSelectionAction * cancelSelectionAction;
+  ::javax::swing::plaf::basic::BasicFileChooserUI$GoHomeAction * goHomeAction;
+  ::javax::swing::plaf::basic::BasicFileChooserUI$ChangeToParentDirectoryAction * changeToParentDirectoryAction;
+  ::javax::swing::plaf::basic::BasicFileChooserUI$NewFolderAction * newFolderAction;
+  ::javax::swing::plaf::basic::BasicFileChooserUI$UpdateAction * updateAction;
+  ::java::io::File * selectedDir;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicFileChooserUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicFormattedTextFieldUI.h b/libjava/javax/swing/plaf/basic/BasicFormattedTextFieldUI.h
new file mode 100644
index 000000000..f024fbb63
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicFormattedTextFieldUI.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicFormattedTextFieldUI__
+#define __javax_swing_plaf_basic_BasicFormattedTextFieldUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicTextFieldUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicFormattedTextFieldUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicFormattedTextFieldUI : public ::javax::swing::plaf::basic::BasicTextFieldUI
+{
+
+public:
+  BasicFormattedTextFieldUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::lang::String * getPropertyPrefix();
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicFormattedTextFieldUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.h b/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.h
new file mode 100644
index 000000000..5cab989ac
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.h
@@ -0,0 +1,64 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicGraphicsUtils__
+#define __javax_swing_plaf_basic_BasicGraphicsUtils__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Dimension;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class AbstractButton;
+        class JComponent;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicGraphicsUtils;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicGraphicsUtils : public ::java::lang::Object
+{
+
+public:
+  BasicGraphicsUtils();
+  static void drawEtchedRect(::java::awt::Graphics *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
+  static ::java::awt::Insets * getEtchedInsets();
+  static void drawGroove(::java::awt::Graphics *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::Color *);
+  static ::java::awt::Insets * getGrooveInsets();
+  static void drawBezel(::java::awt::Graphics *, jint, jint, jint, jint, jboolean, jboolean, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
+  static void drawLoweredBezel(::java::awt::Graphics *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
+  static void drawString(::java::awt::Graphics *, ::java::lang::String *, jint, jint, jint);
+  static void drawStringUnderlineCharAt(::java::awt::Graphics *, ::java::lang::String *, jint, jint, jint);
+public: // actually package-private
+  static void drawString(::javax::swing::JComponent *, ::java::awt::Graphics *, ::java::lang::String *, jint, jint, jint);
+  static void drawStringUnderlineCharAt(::javax::swing::JComponent *, ::java::awt::Graphics *, ::java::lang::String *, jint, jint, jint);
+public:
+  static void drawDashedRect(::java::awt::Graphics *, jint, jint, jint, jint);
+  static ::java::awt::Dimension * getPreferredButtonSize(::javax::swing::AbstractButton *, jint);
+public: // actually package-private
+  static ::java::lang::String * CACHED_TEXT_LAYOUT;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicGraphicsUtils__
diff --git a/libjava/javax/swing/plaf/basic/BasicHTML$HTMLRootView.h b/libjava/javax/swing/plaf/basic/BasicHTML$HTMLRootView.h
new file mode 100644
index 000000000..368ab8715
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicHTML$HTMLRootView.h
@@ -0,0 +1,87 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicHTML$HTMLRootView__
+#define __javax_swing_plaf_basic_BasicHTML$HTMLRootView__
+
+#pragma interface
+
+#include <javax/swing/text/View.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Container;
+        class Graphics;
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace event
+      {
+          class DocumentEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicHTML$HTMLRootView;
+        }
+      }
+      namespace text
+      {
+          class AttributeSet;
+          class Document;
+          class EditorKit;
+          class Element;
+          class Position$Bias;
+          class View;
+          class ViewFactory;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicHTML$HTMLRootView : public ::javax::swing::text::View
+{
+
+public:
+  BasicHTML$HTMLRootView(::javax::swing::JComponent *, ::javax::swing::text::View *, ::javax::swing::text::EditorKit *, ::javax::swing::text::Document *);
+  virtual ::javax::swing::text::ViewFactory * getViewFactory();
+  virtual void preferenceChanged(::javax::swing::text::View *, jboolean, jboolean);
+  virtual void setView(::javax::swing::text::View *);
+  virtual void setSize(jfloat, jfloat);
+  virtual ::javax::swing::text::View * getView(jint);
+  virtual jint getViewCount();
+  virtual ::java::awt::Container * getContainer();
+  virtual jfloat getPreferredSpan(jint);
+  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
+  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
+  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
+  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual jint getNextVisualPositionFrom(jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
+  virtual jint getStartOffset();
+  virtual jint getEndOffset();
+  virtual ::javax::swing::text::Document * getDocument();
+  virtual ::javax::swing::text::AttributeSet * getAttributes();
+  virtual ::javax::swing::text::Element * getElement();
+private:
+  ::javax::swing::text::View * __attribute__((aligned(__alignof__( ::javax::swing::text::View)))) view;
+  ::javax::swing::JComponent * component;
+  ::javax::swing::text::EditorKit * editorKit;
+  ::javax::swing::text::Document * document;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicHTML$HTMLRootView__
diff --git a/libjava/javax/swing/plaf/basic/BasicHTML.h b/libjava/javax/swing/plaf/basic/BasicHTML.h
new file mode 100644
index 000000000..7ae85956e
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicHTML.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicHTML__
+#define __javax_swing_plaf_basic_BasicHTML__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicHTML;
+        }
+      }
+      namespace text
+      {
+          class View;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicHTML : public ::java::lang::Object
+{
+
+public:
+  BasicHTML();
+  static ::javax::swing::text::View * createHTMLView(::javax::swing::JComponent *, ::java::lang::String *);
+  static jboolean isHTMLString(::java::lang::String *);
+  static void updateRenderer(::javax::swing::JComponent *, ::java::lang::String *);
+  static ::java::lang::String * propertyKey;
+  static ::java::lang::String * documentBaseKey;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicHTML__
diff --git a/libjava/javax/swing/plaf/basic/BasicIconFactory$1.h b/libjava/javax/swing/plaf/basic/BasicIconFactory$1.h
new file mode 100644
index 000000000..f15f5b9c4
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicIconFactory$1.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicIconFactory$1__
+#define __javax_swing_plaf_basic_BasicIconFactory$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicIconFactory$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicIconFactory$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicIconFactory$1();
+public:
+  virtual jint getIconHeight();
+  virtual jint getIconWidth();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicIconFactory$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicIconFactory$2.h b/libjava/javax/swing/plaf/basic/BasicIconFactory$2.h
new file mode 100644
index 000000000..4b97c6d5e
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicIconFactory$2.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicIconFactory$2__
+#define __javax_swing_plaf_basic_BasicIconFactory$2__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicIconFactory$2;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicIconFactory$2 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicIconFactory$2();
+public:
+  virtual jint getIconHeight();
+  virtual jint getIconWidth();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicIconFactory$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicIconFactory$CheckBoxIcon.h b/libjava/javax/swing/plaf/basic/BasicIconFactory$CheckBoxIcon.h
new file mode 100644
index 000000000..0287f1c7a
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicIconFactory$CheckBoxIcon.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicIconFactory$CheckBoxIcon__
+#define __javax_swing_plaf_basic_BasicIconFactory$CheckBoxIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicIconFactory$CheckBoxIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicIconFactory$CheckBoxIcon : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicIconFactory$CheckBoxIcon();
+public:
+  virtual jint getIconHeight();
+  virtual jint getIconWidth();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicIconFactory$CheckBoxIcon__
diff --git a/libjava/javax/swing/plaf/basic/BasicIconFactory$CheckBoxMenuItemIcon.h b/libjava/javax/swing/plaf/basic/BasicIconFactory$CheckBoxMenuItemIcon.h
new file mode 100644
index 000000000..9c1d7f026
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicIconFactory$CheckBoxMenuItemIcon.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicIconFactory$CheckBoxMenuItemIcon__
+#define __javax_swing_plaf_basic_BasicIconFactory$CheckBoxMenuItemIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicIconFactory$CheckBoxMenuItemIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicIconFactory$CheckBoxMenuItemIcon : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicIconFactory$CheckBoxMenuItemIcon();
+public:
+  virtual jint getIconHeight();
+  virtual jint getIconWidth();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicIconFactory$CheckBoxMenuItemIcon__
diff --git a/libjava/javax/swing/plaf/basic/BasicIconFactory$DummyIcon.h b/libjava/javax/swing/plaf/basic/BasicIconFactory$DummyIcon.h
new file mode 100644
index 000000000..d77719032
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicIconFactory$DummyIcon.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicIconFactory$DummyIcon__
+#define __javax_swing_plaf_basic_BasicIconFactory$DummyIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicIconFactory$DummyIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicIconFactory$DummyIcon : public ::java::lang::Object
+{
+
+  BasicIconFactory$DummyIcon();
+public:
+  virtual jint getIconHeight();
+  virtual jint getIconWidth();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+public: // actually package-private
+  BasicIconFactory$DummyIcon(::javax::swing::plaf::basic::BasicIconFactory$DummyIcon *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicIconFactory$DummyIcon__
diff --git a/libjava/javax/swing/plaf/basic/BasicIconFactory$RadioButtonIcon.h b/libjava/javax/swing/plaf/basic/BasicIconFactory$RadioButtonIcon.h
new file mode 100644
index 000000000..a30f4d0d4
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicIconFactory$RadioButtonIcon.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicIconFactory$RadioButtonIcon__
+#define __javax_swing_plaf_basic_BasicIconFactory$RadioButtonIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicIconFactory$RadioButtonIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicIconFactory$RadioButtonIcon : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicIconFactory$RadioButtonIcon();
+public:
+  virtual jint getIconHeight();
+  virtual jint getIconWidth();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicIconFactory$RadioButtonIcon__
diff --git a/libjava/javax/swing/plaf/basic/BasicIconFactory.h b/libjava/javax/swing/plaf/basic/BasicIconFactory.h
new file mode 100644
index 000000000..fc851373d
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicIconFactory.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicIconFactory__
+#define __javax_swing_plaf_basic_BasicIconFactory__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicIconFactory;
+            class BasicIconFactory$CheckBoxIcon;
+            class BasicIconFactory$RadioButtonIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicIconFactory : public ::java::lang::Object
+{
+
+public:
+  BasicIconFactory();
+  static ::javax::swing::Icon * getMenuItemCheckIcon();
+  static ::javax::swing::Icon * getMenuItemArrowIcon();
+  static ::javax::swing::Icon * getMenuArrowIcon();
+  static ::javax::swing::Icon * getCheckBoxIcon();
+  static ::javax::swing::Icon * getRadioButtonIcon();
+  static ::javax::swing::Icon * getCheckBoxMenuItemIcon();
+  static ::javax::swing::Icon * getRadioButtonMenuItemIcon();
+  static ::javax::swing::Icon * createEmptyFrameIcon();
+public: // actually package-private
+  static const jlong serialVersionUID = 5605588811185324383LL;
+private:
+  static ::javax::swing::plaf::basic::BasicIconFactory$CheckBoxIcon * checkBoxIcon;
+  static ::javax::swing::plaf::basic::BasicIconFactory$RadioButtonIcon * radioButtonIcon;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicIconFactory__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$CloseAction.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$CloseAction.h
new file mode 100644
index 000000000..efce70e9d
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$CloseAction.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$CloseAction__
+#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$CloseAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameTitlePane;
+            class BasicInternalFrameTitlePane$CloseAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameTitlePane$CloseAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicInternalFrameTitlePane$CloseAction(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$CloseAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$IconifyAction.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$IconifyAction.h
new file mode 100644
index 000000000..4ed9a7f74
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$IconifyAction.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$IconifyAction__
+#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$IconifyAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameTitlePane;
+            class BasicInternalFrameTitlePane$IconifyAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameTitlePane$IconifyAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicInternalFrameTitlePane$IconifyAction(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$IconifyAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$MaximizeAction.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$MaximizeAction.h
new file mode 100644
index 000000000..cf31b3c0d
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$MaximizeAction.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$MaximizeAction__
+#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$MaximizeAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameTitlePane;
+            class BasicInternalFrameTitlePane$MaximizeAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameTitlePane$MaximizeAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicInternalFrameTitlePane$MaximizeAction(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$MaximizeAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$MoveAction.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$MoveAction.h
new file mode 100644
index 000000000..6c4570f1f
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$MoveAction.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$MoveAction__
+#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$MoveAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameTitlePane;
+            class BasicInternalFrameTitlePane$MoveAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameTitlePane$MoveAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicInternalFrameTitlePane$MoveAction(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$MoveAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$PaneButton.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$PaneButton.h
new file mode 100644
index 000000000..3177afec5
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$PaneButton.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$PaneButton__
+#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$PaneButton__
+
+#pragma interface
+
+#include <javax/swing/JButton.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class Action;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameTitlePane;
+            class BasicInternalFrameTitlePane$PaneButton;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameTitlePane$PaneButton : public ::javax::swing::JButton
+{
+
+public:
+  BasicInternalFrameTitlePane$PaneButton(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *, ::javax::swing::Action *);
+  virtual jboolean isFocusable();
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::JButton)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$PaneButton__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$PropertyChangeHandler.h
new file mode 100644
index 000000000..be7bb8be6
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$PropertyChangeHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$PropertyChangeHandler__
+#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$PropertyChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameTitlePane;
+            class BasicInternalFrameTitlePane$PropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameTitlePane$PropertyChangeHandler : public ::java::lang::Object
+{
+
+public:
+  BasicInternalFrameTitlePane$PropertyChangeHandler(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$RestoreAction.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$RestoreAction.h
new file mode 100644
index 000000000..b33c5e0cd
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$RestoreAction.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$RestoreAction__
+#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$RestoreAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameTitlePane;
+            class BasicInternalFrameTitlePane$RestoreAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameTitlePane$RestoreAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicInternalFrameTitlePane$RestoreAction(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$RestoreAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$SizeAction.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$SizeAction.h
new file mode 100644
index 000000000..edf1553f8
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$SizeAction.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$SizeAction__
+#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$SizeAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameTitlePane;
+            class BasicInternalFrameTitlePane$SizeAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameTitlePane$SizeAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicInternalFrameTitlePane$SizeAction(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$SizeAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$SystemMenuBar.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$SystemMenuBar.h
new file mode 100644
index 000000000..9510859b9
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$SystemMenuBar.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$SystemMenuBar__
+#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$SystemMenuBar__
+
+#pragma interface
+
+#include <javax/swing/JMenuBar.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameTitlePane;
+            class BasicInternalFrameTitlePane$SystemMenuBar;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameTitlePane$SystemMenuBar : public ::javax::swing::JMenuBar
+{
+
+public:
+  BasicInternalFrameTitlePane$SystemMenuBar(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *);
+  virtual jboolean isFocusTraversable();
+  virtual jboolean isOpaque();
+  virtual void paint(::java::awt::Graphics *);
+  virtual void requestFocus();
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::JMenuBar)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$SystemMenuBar__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$TitlePaneLayout.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$TitlePaneLayout.h
new file mode 100644
index 000000000..4dedb42bd
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$TitlePaneLayout.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$TitlePaneLayout__
+#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$TitlePaneLayout__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameTitlePane;
+            class BasicInternalFrameTitlePane$TitlePaneLayout;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameTitlePane$TitlePaneLayout : public ::java::lang::Object
+{
+
+public:
+  BasicInternalFrameTitlePane$TitlePaneLayout(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *);
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+  virtual void layoutContainer(::java::awt::Container *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  virtual void removeLayoutComponent(::java::awt::Component *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$TitlePaneLayout__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane.h
new file mode 100644
index 000000000..68b826b2f
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane.h
@@ -0,0 +1,110 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane__
+#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane__
+
+#pragma interface
+
+#include <javax/swing/JComponent.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class FontMetrics;
+        class Graphics;
+        class LayoutManager;
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Action;
+        class Icon;
+        class JButton;
+        class JInternalFrame;
+        class JLabel;
+        class JMenu;
+        class JMenuBar;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameTitlePane;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameTitlePane : public ::javax::swing::JComponent
+{
+
+public:
+  BasicInternalFrameTitlePane(::javax::swing::JInternalFrame *);
+public: // actually protected
+  virtual void installTitlePane();
+  virtual void addSubComponents();
+  virtual void createActions();
+  virtual void installListeners();
+  virtual void uninstallListeners();
+  virtual void installDefaults();
+  virtual void uninstallDefaults();
+  virtual void createButtons();
+  virtual void setButtonIcons();
+  virtual void assembleSystemMenu();
+  virtual void addSystemMenuItems(::javax::swing::JMenu *);
+  virtual ::javax::swing::JMenuBar * createSystemMenuBar();
+  virtual ::javax::swing::JMenu * createSystemMenu();
+  virtual void showSystemMenu();
+public:
+  virtual void paintComponent(::java::awt::Graphics *);
+public: // actually protected
+  virtual void paintTitleBackground(::java::awt::Graphics *);
+  virtual ::java::lang::String * getTitle(::java::lang::String *, ::java::awt::FontMetrics *, jint);
+  virtual void postClosingEvent(::javax::swing::JInternalFrame *);
+  virtual void enableActions();
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
+  virtual ::java::awt::LayoutManager * createLayout();
+  static ::java::lang::String * CLOSE_CMD;
+  static ::java::lang::String * ICONIFY_CMD;
+  static ::java::lang::String * MAXIMIZE_CMD;
+  static ::java::lang::String * MOVE_CMD;
+  static ::java::lang::String * RESTORE_CMD;
+  static ::java::lang::String * SIZE_CMD;
+  ::javax::swing::Action * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) closeAction;
+  ::javax::swing::Action * iconifyAction;
+  ::javax::swing::Action * maximizeAction;
+  ::javax::swing::Action * moveAction;
+  ::javax::swing::Action * restoreAction;
+  ::javax::swing::Action * sizeAction;
+  ::javax::swing::JButton * closeButton;
+  ::javax::swing::JButton * iconButton;
+  ::javax::swing::JButton * maxButton;
+  ::javax::swing::Icon * minIcon;
+  ::javax::swing::Icon * maxIcon;
+  ::javax::swing::Icon * iconIcon;
+  ::javax::swing::Icon * closeIcon;
+  ::javax::swing::JInternalFrame * frame;
+  ::javax::swing::JMenuBar * menuBar;
+  ::javax::swing::JMenu * windowMenu;
+  ::java::awt::Color * notSelectedTextColor;
+  ::java::awt::Color * notSelectedTitleColor;
+  ::java::awt::Color * selectedTextColor;
+  ::java::awt::Color * selectedTitleColor;
+  ::java::beans::PropertyChangeListener * propertyChangeListener;
+public: // actually package-private
+  ::javax::swing::JLabel * title;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$BasicInternalFrameListener.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$BasicInternalFrameListener.h
new file mode 100644
index 000000000..d1d36649a
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$BasicInternalFrameListener.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameUI$BasicInternalFrameListener__
+#define __javax_swing_plaf_basic_BasicInternalFrameUI$BasicInternalFrameListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class InternalFrameEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameUI;
+            class BasicInternalFrameUI$BasicInternalFrameListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameUI$BasicInternalFrameListener : public ::java::lang::Object
+{
+
+public: // actually protected
+  BasicInternalFrameUI$BasicInternalFrameListener(::javax::swing::plaf::basic::BasicInternalFrameUI *);
+public:
+  virtual void internalFrameActivated(::javax::swing::event::InternalFrameEvent *);
+  virtual void internalFrameClosed(::javax::swing::event::InternalFrameEvent *);
+  virtual void internalFrameClosing(::javax::swing::event::InternalFrameEvent *);
+  virtual void internalFrameDeactivated(::javax::swing::event::InternalFrameEvent *);
+  virtual void internalFrameDeiconified(::javax::swing::event::InternalFrameEvent *);
+  virtual void internalFrameIconified(::javax::swing::event::InternalFrameEvent *);
+  virtual void internalFrameOpened(::javax::swing::event::InternalFrameEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicInternalFrameUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameUI$BasicInternalFrameListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$BorderListener.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$BorderListener.h
new file mode 100644
index 000000000..18a50e63a
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$BorderListener.h
@@ -0,0 +1,71 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameUI$BorderListener__
+#define __javax_swing_plaf_basic_BasicInternalFrameUI$BorderListener__
+
+#pragma interface
+
+#include <javax/swing/event/MouseInputAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Rectangle;
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameUI;
+            class BasicInternalFrameUI$BorderListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameUI$BorderListener : public ::javax::swing::event::MouseInputAdapter
+{
+
+public: // actually protected
+  BasicInternalFrameUI$BorderListener(::javax::swing::plaf::basic::BasicInternalFrameUI *);
+public:
+  virtual void mouseClicked(::java::awt::event::MouseEvent *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+  virtual void mouseExited(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  virtual void setCursor(::java::awt::event::MouseEvent *);
+public:
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+private:
+  jint sectionOfClick(jint, jint);
+public: // actually package-private
+  jint __attribute__((aligned(__alignof__( ::javax::swing::event::MouseInputAdapter)))) showingCursor;
+public: // actually protected
+  const jint RESIZE_NONE;
+private:
+  jint xOffset;
+  jint yOffset;
+  jint direction;
+  ::java::awt::Rectangle * cacheRect;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicInternalFrameUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameUI$BorderListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$ComponentHandler.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$ComponentHandler.h
new file mode 100644
index 000000000..aeedc9352
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$ComponentHandler.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameUI$ComponentHandler__
+#define __javax_swing_plaf_basic_BasicInternalFrameUI$ComponentHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ComponentEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameUI;
+            class BasicInternalFrameUI$ComponentHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameUI$ComponentHandler : public ::java::lang::Object
+{
+
+public: // actually protected
+  BasicInternalFrameUI$ComponentHandler(::javax::swing::plaf::basic::BasicInternalFrameUI *);
+public:
+  virtual void componentHidden(::java::awt::event::ComponentEvent *);
+  virtual void componentMoved(::java::awt::event::ComponentEvent *);
+  virtual void componentResized(::java::awt::event::ComponentEvent *);
+  virtual void componentShown(::java::awt::event::ComponentEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicInternalFrameUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameUI$ComponentHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$GlassPaneDispatcher.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$GlassPaneDispatcher.h
new file mode 100644
index 000000000..245290232
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$GlassPaneDispatcher.h
@@ -0,0 +1,65 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameUI$GlassPaneDispatcher__
+#define __javax_swing_plaf_basic_BasicInternalFrameUI$GlassPaneDispatcher__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameUI;
+            class BasicInternalFrameUI$GlassPaneDispatcher;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameUI$GlassPaneDispatcher : public ::java::lang::Object
+{
+
+public: // actually protected
+  BasicInternalFrameUI$GlassPaneDispatcher(::javax::swing::plaf::basic::BasicInternalFrameUI *);
+public:
+  virtual void mouseEntered(::java::awt::event::MouseEvent *);
+  virtual void mouseClicked(::java::awt::event::MouseEvent *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+  virtual void mouseExited(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+private:
+  void handleEvent(::java::awt::event::MouseEvent *);
+  void redispatch(jint, ::java::awt::event::MouseEvent *, ::java::awt::Component *);
+  ::java::awt::Component * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mouseEventTarget;
+  ::java::awt::Component * dragTarget;
+  jboolean isDragging;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicInternalFrameUI * this$0;
+  static jboolean $assertionsDisabled;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameUI$GlassPaneDispatcher__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFrameBorder.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFrameBorder.h
new file mode 100644
index 000000000..a5ddab067
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFrameBorder.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameUI$InternalFrameBorder__
+#define __javax_swing_plaf_basic_BasicInternalFrameUI$InternalFrameBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameUI;
+            class BasicInternalFrameUI$InternalFrameBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameUI$InternalFrameBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public: // actually package-private
+  BasicInternalFrameUI$InternalFrameBorder(::javax::swing::plaf::basic::BasicInternalFrameUI *);
+public:
+  virtual jboolean isBorderOpaque();
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+public: // actually package-private
+  static const jint bSize = 5;
+  static const jint cornerSize = 10;
+  ::javax::swing::plaf::basic::BasicInternalFrameUI * __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameUI$InternalFrameBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFrameLayout.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFrameLayout.h
new file mode 100644
index 000000000..6ff8ae9ab
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFrameLayout.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameUI$InternalFrameLayout__
+#define __javax_swing_plaf_basic_BasicInternalFrameUI$InternalFrameLayout__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameUI;
+            class BasicInternalFrameUI$InternalFrameLayout;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameUI$InternalFrameLayout : public ::java::lang::Object
+{
+
+public:
+  BasicInternalFrameUI$InternalFrameLayout(::javax::swing::plaf::basic::BasicInternalFrameUI *);
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+  virtual void layoutContainer(::java::awt::Container *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+private:
+  ::java::awt::Dimension * getSize(::java::awt::Container *, jboolean);
+public:
+  virtual void removeLayoutComponent(::java::awt::Component *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicInternalFrameUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameUI$InternalFrameLayout__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFramePropertyChangeListener.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFramePropertyChangeListener.h
new file mode 100644
index 000000000..c1a37ba0d
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFramePropertyChangeListener.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameUI$InternalFramePropertyChangeListener__
+#define __javax_swing_plaf_basic_BasicInternalFrameUI$InternalFramePropertyChangeListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameUI;
+            class BasicInternalFrameUI$InternalFramePropertyChangeListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameUI$InternalFramePropertyChangeListener : public ::java::lang::Object
+{
+
+public:
+  BasicInternalFrameUI$InternalFramePropertyChangeListener(::javax::swing::plaf::basic::BasicInternalFrameUI *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicInternalFrameUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameUI$InternalFramePropertyChangeListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$ShowSystemMenuAction.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$ShowSystemMenuAction.h
new file mode 100644
index 000000000..9b43d26df
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$ShowSystemMenuAction.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameUI$ShowSystemMenuAction__
+#define __javax_swing_plaf_basic_BasicInternalFrameUI$ShowSystemMenuAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicInternalFrameUI;
+            class BasicInternalFrameUI$ShowSystemMenuAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameUI$ShowSystemMenuAction : public ::javax::swing::AbstractAction
+{
+
+  BasicInternalFrameUI$ShowSystemMenuAction(::javax::swing::plaf::basic::BasicInternalFrameUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  BasicInternalFrameUI$ShowSystemMenuAction(::javax::swing::plaf::basic::BasicInternalFrameUI *, ::javax::swing::plaf::basic::BasicInternalFrameUI$ShowSystemMenuAction *);
+  ::javax::swing::plaf::basic::BasicInternalFrameUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameUI$ShowSystemMenuAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI.h
new file mode 100644
index 000000000..18aa9207e
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI.h
@@ -0,0 +1,139 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicInternalFrameUI__
+#define __javax_swing_plaf_basic_BasicInternalFrameUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/InternalFrameUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class LayoutManager;
+      namespace event
+      {
+          class ComponentListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class DesktopManager;
+        class JComponent;
+        class JDesktopPane;
+        class JInternalFrame;
+        class KeyStroke;
+      namespace event
+      {
+          class MouseInputAdapter;
+          class MouseInputListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicInternalFrameTitlePane;
+            class BasicInternalFrameUI;
+            class BasicInternalFrameUI$BasicInternalFrameListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicInternalFrameUI : public ::javax::swing::plaf::InternalFrameUI
+{
+
+public:
+  BasicInternalFrameUI(::javax::swing::JInternalFrame *);
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installDefaults();
+  virtual void installKeyboardActions();
+  virtual void installComponents();
+  virtual void installListeners();
+  virtual void uninstallDefaults();
+  virtual void uninstallComponents();
+  virtual void uninstallListeners();
+  virtual void uninstallKeyboardActions();
+  virtual ::java::awt::LayoutManager * createLayoutManager();
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
+public:
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void replacePane(::javax::swing::JComponent *, ::javax::swing::JComponent *);
+  virtual void deinstallMouseHandlers(::javax::swing::JComponent *);
+  virtual void installMouseHandlers(::javax::swing::JComponent *);
+  virtual ::javax::swing::JComponent * createNorthPane(::javax::swing::JInternalFrame *);
+  virtual ::javax::swing::JComponent * createWestPane(::javax::swing::JInternalFrame *);
+  virtual ::javax::swing::JComponent * createSouthPane(::javax::swing::JInternalFrame *);
+  virtual ::javax::swing::JComponent * createEastPane(::javax::swing::JInternalFrame *);
+  virtual ::javax::swing::event::MouseInputAdapter * createBorderListener(::javax::swing::JInternalFrame *);
+  virtual void createInternalFrameListener();
+  virtual jboolean isKeyBindingRegistered();
+  virtual void setKeyBindingRegistered(jboolean);
+public:
+  virtual jboolean isKeyBindingActive();
+public: // actually protected
+  virtual void setKeyBindingActive(jboolean);
+  virtual void setupMenuOpenKey();
+  virtual void setupMenuCloseKey();
+public:
+  virtual ::javax::swing::JComponent * getNorthPane();
+  virtual void setNorthPane(::javax::swing::JComponent *);
+  virtual ::javax::swing::JComponent * getSouthPane();
+  virtual void setSouthPane(::javax::swing::JComponent *);
+  virtual void setEastPane(::javax::swing::JComponent *);
+  virtual ::javax::swing::JComponent * getEastPane();
+  virtual void setWestPane(::javax::swing::JComponent *);
+  virtual ::javax::swing::JComponent * getWestPane();
+public: // actually protected
+  virtual ::javax::swing::DesktopManager * getDesktopManager();
+  virtual ::javax::swing::DesktopManager * createDesktopManager();
+  virtual void closeFrame(::javax::swing::JInternalFrame *);
+  virtual void maximizeFrame(::javax::swing::JInternalFrame *);
+  virtual void minimizeFrame(::javax::swing::JInternalFrame *);
+  virtual void iconifyFrame(::javax::swing::JInternalFrame *);
+  virtual void deiconifyFrame(::javax::swing::JInternalFrame *);
+  virtual void activateFrame(::javax::swing::JInternalFrame *);
+  virtual void deactivateFrame(::javax::swing::JInternalFrame *);
+  virtual ::java::awt::event::ComponentListener * createComponentListener();
+  virtual ::javax::swing::event::MouseInputListener * createGlassPaneDispatcher();
+  ::javax::swing::event::MouseInputAdapter * __attribute__((aligned(__alignof__( ::javax::swing::plaf::InternalFrameUI)))) borderListener;
+  ::java::awt::event::ComponentListener * componentListener;
+  ::javax::swing::event::MouseInputListener * glassPaneDispatcher;
+  ::java::beans::PropertyChangeListener * propertyChangeListener;
+private:
+  ::javax::swing::plaf::basic::BasicInternalFrameUI$BasicInternalFrameListener * internalFrameListener;
+public: // actually protected
+  ::javax::swing::JComponent * eastPane;
+  ::javax::swing::JComponent * northPane;
+  ::javax::swing::JComponent * southPane;
+  ::javax::swing::JComponent * westPane;
+  ::javax::swing::KeyStroke * openMenuKey;
+  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * titlePane;
+  ::javax::swing::JInternalFrame * frame;
+  ::java::awt::LayoutManager * internalFrameLayout;
+private:
+  ::javax::swing::JDesktopPane * desktopPane;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicInternalFrameUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicLabelUI$1.h b/libjava/javax/swing/plaf/basic/BasicLabelUI$1.h
new file mode 100644
index 000000000..e3004516f
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicLabelUI$1.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicLabelUI$1__
+#define __javax_swing_plaf_basic_BasicLabelUI$1__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicLabelUI;
+            class BasicLabelUI$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicLabelUI$1 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicLabelUI$1(::javax::swing::plaf::basic::BasicLabelUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicLabelUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicLabelUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicLabelUI.h b/libjava/javax/swing/plaf/basic/BasicLabelUI.h
new file mode 100644
index 000000000..5c6711423
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicLabelUI.h
@@ -0,0 +1,87 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicLabelUI__
+#define __javax_swing_plaf_basic_BasicLabelUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/LabelUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class FontMetrics;
+        class Graphics;
+        class Insets;
+        class Rectangle;
+    }
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+        class JComponent;
+        class JLabel;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicLabelUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicLabelUI : public ::javax::swing::plaf::LabelUI
+{
+
+public:
+  BasicLabelUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::lang::String * layoutCL(::javax::swing::JLabel *, ::java::awt::FontMetrics *, ::java::lang::String *, ::javax::swing::Icon *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, ::java::awt::Rectangle *);
+  virtual void paintDisabledText(::javax::swing::JLabel *, ::java::awt::Graphics *, ::java::lang::String *, jint, jint);
+  virtual void paintEnabledText(::javax::swing::JLabel *, ::java::awt::Graphics *, ::java::lang::String *, jint, jint);
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installComponents(::javax::swing::JLabel *);
+  virtual void uninstallComponents(::javax::swing::JLabel *);
+  virtual void installDefaults(::javax::swing::JLabel *);
+  virtual void uninstallDefaults(::javax::swing::JLabel *);
+  virtual void installKeyboardActions(::javax::swing::JLabel *);
+  virtual void uninstallKeyboardActions(::javax::swing::JLabel *);
+  virtual void installListeners(::javax::swing::JLabel *);
+  virtual void uninstallListeners(::javax::swing::JLabel *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+private:
+  ::java::awt::FontMetrics * getFontMetrics(::javax::swing::JLabel *);
+public: // actually protected
+  static ::javax::swing::plaf::basic::BasicLabelUI * labelUI;
+private:
+  ::java::awt::Rectangle * __attribute__((aligned(__alignof__( ::javax::swing::plaf::LabelUI)))) vr;
+  ::java::awt::Rectangle * ir;
+  ::java::awt::Rectangle * tr;
+  ::java::awt::Insets * cachedInsets;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicLabelUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicListUI$ActionListenerProxy.h b/libjava/javax/swing/plaf/basic/BasicListUI$ActionListenerProxy.h
new file mode 100644
index 000000000..48cfc19f0
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicListUI$ActionListenerProxy.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicListUI$ActionListenerProxy__
+#define __javax_swing_plaf_basic_BasicListUI$ActionListenerProxy__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+          class ActionListener;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicListUI$ActionListenerProxy;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicListUI$ActionListenerProxy : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicListUI$ActionListenerProxy(::java::awt::event::ActionListener *, ::java::lang::String *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::java::awt::event::ActionListener * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) target;
+  ::java::lang::String * bindingCommandName;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicListUI$ActionListenerProxy__
diff --git a/libjava/javax/swing/plaf/basic/BasicListUI$FocusHandler.h b/libjava/javax/swing/plaf/basic/BasicListUI$FocusHandler.h
new file mode 100644
index 000000000..a79c2a9fb
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicListUI$FocusHandler.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicListUI$FocusHandler__
+#define __javax_swing_plaf_basic_BasicListUI$FocusHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class FocusEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicListUI;
+            class BasicListUI$FocusHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicListUI$FocusHandler : public ::java::lang::Object
+{
+
+public:
+  BasicListUI$FocusHandler(::javax::swing::plaf::basic::BasicListUI *);
+  virtual void focusGained(::java::awt::event::FocusEvent *);
+  virtual void focusLost(::java::awt::event::FocusEvent *);
+public: // actually protected
+  virtual void repaintCellFocus();
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicListUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicListUI$FocusHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicListUI$ListAction.h b/libjava/javax/swing/plaf/basic/BasicListUI$ListAction.h
new file mode 100644
index 000000000..0cec9aa6e
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicListUI$ListAction.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicListUI$ListAction__
+#define __javax_swing_plaf_basic_BasicListUI$ListAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicListUI;
+            class BasicListUI$ListAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicListUI$ListAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicListUI$ListAction(::javax::swing::plaf::basic::BasicListUI *, ::java::lang::String *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicListUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicListUI$ListAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicListUI$ListDataHandler.h b/libjava/javax/swing/plaf/basic/BasicListUI$ListDataHandler.h
new file mode 100644
index 000000000..f0c6a1579
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicListUI$ListDataHandler.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicListUI$ListDataHandler__
+#define __javax_swing_plaf_basic_BasicListUI$ListDataHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ListDataEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicListUI;
+            class BasicListUI$ListDataHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicListUI$ListDataHandler : public ::java::lang::Object
+{
+
+public:
+  BasicListUI$ListDataHandler(::javax::swing::plaf::basic::BasicListUI *);
+  virtual void contentsChanged(::javax::swing::event::ListDataEvent *);
+  virtual void intervalAdded(::javax::swing::event::ListDataEvent *);
+  virtual void intervalRemoved(::javax::swing::event::ListDataEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicListUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicListUI$ListDataHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicListUI$ListSelectionHandler.h b/libjava/javax/swing/plaf/basic/BasicListUI$ListSelectionHandler.h
new file mode 100644
index 000000000..8211c6982
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicListUI$ListSelectionHandler.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicListUI$ListSelectionHandler__
+#define __javax_swing_plaf_basic_BasicListUI$ListSelectionHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ListSelectionEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicListUI;
+            class BasicListUI$ListSelectionHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicListUI$ListSelectionHandler : public ::java::lang::Object
+{
+
+public:
+  BasicListUI$ListSelectionHandler(::javax::swing::plaf::basic::BasicListUI *);
+  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicListUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicListUI$ListSelectionHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicListUI$MouseInputHandler.h b/libjava/javax/swing/plaf/basic/BasicListUI$MouseInputHandler.h
new file mode 100644
index 000000000..deb7b5832
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicListUI$MouseInputHandler.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicListUI$MouseInputHandler__
+#define __javax_swing_plaf_basic_BasicListUI$MouseInputHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicListUI;
+            class BasicListUI$MouseInputHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicListUI$MouseInputHandler : public ::java::lang::Object
+{
+
+public:
+  BasicListUI$MouseInputHandler(::javax::swing::plaf::basic::BasicListUI *);
+  virtual void mouseClicked(::java::awt::event::MouseEvent *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+  virtual void mouseEntered(::java::awt::event::MouseEvent *);
+  virtual void mouseExited(::java::awt::event::MouseEvent *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicListUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicListUI$MouseInputHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicListUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicListUI$PropertyChangeHandler.h
new file mode 100644
index 000000000..8993d1b38
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicListUI$PropertyChangeHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicListUI$PropertyChangeHandler__
+#define __javax_swing_plaf_basic_BasicListUI$PropertyChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicListUI;
+            class BasicListUI$PropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicListUI$PropertyChangeHandler : public ::java::lang::Object
+{
+
+public:
+  BasicListUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicListUI *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicListUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicListUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicListUI.h b/libjava/javax/swing/plaf/basic/BasicListUI.h
new file mode 100644
index 000000000..2d0d79d84
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicListUI.h
@@ -0,0 +1,128 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicListUI__
+#define __javax_swing_plaf_basic_BasicListUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ListUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+        class Point;
+        class Rectangle;
+      namespace event
+      {
+          class FocusListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class CellRendererPane;
+        class JComponent;
+        class JList;
+        class ListCellRenderer;
+        class ListModel;
+        class ListSelectionModel;
+      namespace event
+      {
+          class ListDataListener;
+          class ListSelectionListener;
+          class MouseInputListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicListUI;
+            class BasicListUI$ListAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicListUI : public ::javax::swing::plaf::ListUI
+{
+
+public:
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual jint getRowHeight(jint);
+public:
+  virtual ::java::awt::Rectangle * getCellBounds(::javax::swing::JList *, jint, jint);
+private:
+  jint getCellHeight(jint);
+public: // actually protected
+  virtual jint convertRowToY(jint);
+  virtual jint convertYToRow(jint);
+  virtual void updateLayoutState();
+  virtual void maybeUpdateLayoutState();
+public:
+  BasicListUI();
+public: // actually protected
+  virtual void installDefaults();
+  virtual void uninstallDefaults();
+  virtual void installListeners();
+  virtual void uninstallListeners();
+  virtual void installKeyboardActions();
+  virtual void uninstallKeyboardActions();
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void paintCell(::java::awt::Graphics *, jint, ::java::awt::Rectangle *, ::javax::swing::ListCellRenderer *, ::javax::swing::ListModel *, ::javax::swing::ListSelectionModel *, jint);
+public:
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual jint locationToIndex(::javax::swing::JList *, ::java::awt::Point *);
+  virtual ::java::awt::Point * indexToLocation(::javax::swing::JList *, jint);
+public: // actually protected
+  virtual ::java::awt::event::FocusListener * createFocusListener();
+  virtual ::javax::swing::event::ListDataListener * createListDataListener();
+  virtual ::javax::swing::event::ListSelectionListener * createListSelectionListener();
+  virtual ::javax::swing::event::MouseInputListener * createMouseInputListener();
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
+  virtual void selectNextIndex();
+  virtual void selectPreviousIndex();
+  static const jint modelChanged = 1;
+  static const jint selectionModelChanged = 2;
+  static const jint fontChanged = 4;
+  static const jint fixedCellWidthChanged = 8;
+  static const jint fixedCellHeightChanged = 16;
+  static const jint prototypeCellValueChanged = 32;
+  static const jint cellRendererChanged = 64;
+  ::java::awt::event::FocusListener * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ListUI)))) focusListener;
+  ::javax::swing::event::ListDataListener * listDataListener;
+  ::javax::swing::event::ListSelectionListener * listSelectionListener;
+  ::javax::swing::event::MouseInputListener * mouseInputListener;
+  ::java::beans::PropertyChangeListener * propertyChangeListener;
+  ::javax::swing::JList * list;
+  jint cellHeight;
+  jint cellWidth;
+  JArray< jint > * cellHeights;
+  jint updateLayoutStateNeeded;
+  ::javax::swing::CellRendererPane * rendererPane;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicListUI$ListAction * action;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicListUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$1.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$1.h
new file mode 100644
index 000000000..19b3df511
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$1.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicLookAndFeel$1__
+#define __javax_swing_plaf_basic_BasicLookAndFeel$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class UIDefaults;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicLookAndFeel;
+            class BasicLookAndFeel$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicLookAndFeel$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicLookAndFeel$1(::javax::swing::plaf::basic::BasicLookAndFeel *);
+public:
+  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicLookAndFeel$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$2.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$2.h
new file mode 100644
index 000000000..4abad0388
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$2.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicLookAndFeel$2__
+#define __javax_swing_plaf_basic_BasicLookAndFeel$2__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class UIDefaults;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicLookAndFeel;
+            class BasicLookAndFeel$2;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicLookAndFeel$2 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicLookAndFeel$2(::javax::swing::plaf::basic::BasicLookAndFeel *);
+public:
+  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicLookAndFeel$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$3.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$3.h
new file mode 100644
index 000000000..9067d731e
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$3.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicLookAndFeel$3__
+#define __javax_swing_plaf_basic_BasicLookAndFeel$3__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class UIDefaults;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicLookAndFeel;
+            class BasicLookAndFeel$3;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicLookAndFeel$3 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicLookAndFeel$3(::javax::swing::plaf::basic::BasicLookAndFeel *);
+public:
+  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicLookAndFeel$3__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$4.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$4.h
new file mode 100644
index 000000000..b92945c84
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$4.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicLookAndFeel$4__
+#define __javax_swing_plaf_basic_BasicLookAndFeel$4__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class UIDefaults;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicLookAndFeel;
+            class BasicLookAndFeel$4;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicLookAndFeel$4 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicLookAndFeel$4(::javax::swing::plaf::basic::BasicLookAndFeel *);
+public:
+  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicLookAndFeel$4__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$5.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$5.h
new file mode 100644
index 000000000..f87f80e01
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$5.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicLookAndFeel$5__
+#define __javax_swing_plaf_basic_BasicLookAndFeel$5__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class UIDefaults;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicLookAndFeel;
+            class BasicLookAndFeel$5;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicLookAndFeel$5 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicLookAndFeel$5(::javax::swing::plaf::basic::BasicLookAndFeel *);
+public:
+  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicLookAndFeel$5__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$6.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$6.h
new file mode 100644
index 000000000..9271f9643
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$6.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicLookAndFeel$6__
+#define __javax_swing_plaf_basic_BasicLookAndFeel$6__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class UIDefaults;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicLookAndFeel;
+            class BasicLookAndFeel$6;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicLookAndFeel$6 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicLookAndFeel$6(::javax::swing::plaf::basic::BasicLookAndFeel *);
+public:
+  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicLookAndFeel$6__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$7.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$7.h
new file mode 100644
index 000000000..9b78750c0
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$7.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicLookAndFeel$7__
+#define __javax_swing_plaf_basic_BasicLookAndFeel$7__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class UIDefaults;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicLookAndFeel;
+            class BasicLookAndFeel$7;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicLookAndFeel$7 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicLookAndFeel$7(::javax::swing::plaf::basic::BasicLookAndFeel *);
+public:
+  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicLookAndFeel$7__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$AudioAction.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$AudioAction.h
new file mode 100644
index 000000000..0227ab30e
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$AudioAction.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicLookAndFeel$AudioAction__
+#define __javax_swing_plaf_basic_BasicLookAndFeel$AudioAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicLookAndFeel;
+            class BasicLookAndFeel$AudioAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicLookAndFeel$AudioAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicLookAndFeel$AudioAction(::javax::swing::plaf::basic::BasicLookAndFeel *, ::java::lang::Object *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::java::lang::Object * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) key;
+  ::javax::swing::plaf::basic::BasicLookAndFeel * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicLookAndFeel$AudioAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$PopupHelper.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$PopupHelper.h
new file mode 100644
index 000000000..03118997e
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$PopupHelper.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicLookAndFeel$PopupHelper__
+#define __javax_swing_plaf_basic_BasicLookAndFeel$PopupHelper__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class AWTEvent;
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicLookAndFeel;
+            class BasicLookAndFeel$PopupHelper;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicLookAndFeel$PopupHelper : public ::java::lang::Object
+{
+
+  BasicLookAndFeel$PopupHelper(::javax::swing::plaf::basic::BasicLookAndFeel *);
+public:
+  virtual void eventDispatched(::java::awt::AWTEvent *);
+private:
+  void mousePressed(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  BasicLookAndFeel$PopupHelper(::javax::swing::plaf::basic::BasicLookAndFeel *, ::javax::swing::plaf::basic::BasicLookAndFeel$PopupHelper *);
+  ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicLookAndFeel$PopupHelper__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel.h
new file mode 100644
index 000000000..13b4adac4
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicLookAndFeel.h
@@ -0,0 +1,63 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicLookAndFeel__
+#define __javax_swing_plaf_basic_BasicLookAndFeel__
+
+#pragma interface
+
+#include <javax/swing/LookAndFeel.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class Action;
+        class ActionMap;
+        class UIDefaults;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicLookAndFeel;
+            class BasicLookAndFeel$PopupHelper;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicLookAndFeel : public ::javax::swing::LookAndFeel
+{
+
+public:
+  BasicLookAndFeel();
+  virtual ::javax::swing::UIDefaults * getDefaults();
+public: // actually protected
+  virtual void initClassDefaults(::javax::swing::UIDefaults *);
+  virtual void initSystemColorDefaults(::javax::swing::UIDefaults *);
+  virtual void loadSystemColors(::javax::swing::UIDefaults *, JArray< ::java::lang::String * > *, jboolean);
+private:
+  void loadResourceBundle(::javax::swing::UIDefaults *);
+public: // actually protected
+  virtual void initComponentDefaults(::javax::swing::UIDefaults *);
+  virtual ::javax::swing::ActionMap * getAudioActionMap();
+  virtual ::javax::swing::Action * createAudioAction(::java::lang::Object *);
+  virtual void playSound(::javax::swing::Action *);
+public:
+  virtual void initialize();
+  virtual void uninitialize();
+public: // actually package-private
+  static const jlong serialVersionUID = -6096995660290287879LL;
+  static ::java::lang::String * DONT_CANCEL_POPUP;
+private:
+  ::javax::swing::plaf::basic::BasicLookAndFeel$PopupHelper * __attribute__((aligned(__alignof__( ::javax::swing::LookAndFeel)))) popupHelper;
+  ::javax::swing::ActionMap * audioActionMap;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicLookAndFeel__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuBarUI$ChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuBarUI$ChangeHandler.h
new file mode 100644
index 000000000..106c4d95b
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuBarUI$ChangeHandler.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuBarUI$ChangeHandler__
+#define __javax_swing_plaf_basic_BasicMenuBarUI$ChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ChangeEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicMenuBarUI;
+            class BasicMenuBarUI$ChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuBarUI$ChangeHandler : public ::java::lang::Object
+{
+
+  BasicMenuBarUI$ChangeHandler(::javax::swing::plaf::basic::BasicMenuBarUI *);
+public:
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+public: // actually package-private
+  BasicMenuBarUI$ChangeHandler(::javax::swing::plaf::basic::BasicMenuBarUI *, ::javax::swing::plaf::basic::BasicMenuBarUI$ChangeHandler *);
+  ::javax::swing::plaf::basic::BasicMenuBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuBarUI$ChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuBarUI$ContainerHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuBarUI$ContainerHandler.h
new file mode 100644
index 000000000..fe9e6810a
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuBarUI$ContainerHandler.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuBarUI$ContainerHandler__
+#define __javax_swing_plaf_basic_BasicMenuBarUI$ContainerHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ContainerEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicMenuBarUI;
+            class BasicMenuBarUI$ContainerHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuBarUI$ContainerHandler : public ::java::lang::Object
+{
+
+  BasicMenuBarUI$ContainerHandler(::javax::swing::plaf::basic::BasicMenuBarUI *);
+public:
+  virtual void componentAdded(::java::awt::event::ContainerEvent *);
+  virtual void componentRemoved(::java::awt::event::ContainerEvent *);
+public: // actually package-private
+  BasicMenuBarUI$ContainerHandler(::javax::swing::plaf::basic::BasicMenuBarUI *, ::javax::swing::plaf::basic::BasicMenuBarUI$ContainerHandler *);
+  ::javax::swing::plaf::basic::BasicMenuBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuBarUI$ContainerHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuBarUI$FocusAction.h b/libjava/javax/swing/plaf/basic/BasicMenuBarUI$FocusAction.h
new file mode 100644
index 000000000..b1882e190
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuBarUI$FocusAction.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuBarUI$FocusAction__
+#define __javax_swing_plaf_basic_BasicMenuBarUI$FocusAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicMenuBarUI$FocusAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuBarUI$FocusAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicMenuBarUI$FocusAction();
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuBarUI$FocusAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuBarUI$MouseInputHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuBarUI$MouseInputHandler.h
new file mode 100644
index 000000000..80b279360
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuBarUI$MouseInputHandler.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuBarUI$MouseInputHandler__
+#define __javax_swing_plaf_basic_BasicMenuBarUI$MouseInputHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicMenuBarUI;
+            class BasicMenuBarUI$MouseInputHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuBarUI$MouseInputHandler : public ::java::lang::Object
+{
+
+  BasicMenuBarUI$MouseInputHandler(::javax::swing::plaf::basic::BasicMenuBarUI *);
+public:
+  virtual void mouseClicked(::java::awt::event::MouseEvent *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+  virtual void mouseExited(::java::awt::event::MouseEvent *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+  virtual void mouseEntered(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  BasicMenuBarUI$MouseInputHandler(::javax::swing::plaf::basic::BasicMenuBarUI *, ::javax::swing::plaf::basic::BasicMenuBarUI$MouseInputHandler *);
+  ::javax::swing::plaf::basic::BasicMenuBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuBarUI$MouseInputHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuBarUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuBarUI$PropertyChangeHandler.h
new file mode 100644
index 000000000..0365962d2
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuBarUI$PropertyChangeHandler.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuBarUI$PropertyChangeHandler__
+#define __javax_swing_plaf_basic_BasicMenuBarUI$PropertyChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicMenuBarUI;
+            class BasicMenuBarUI$PropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuBarUI$PropertyChangeHandler : public ::java::lang::Object
+{
+
+  BasicMenuBarUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicMenuBarUI *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  BasicMenuBarUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicMenuBarUI *, ::javax::swing::plaf::basic::BasicMenuBarUI$PropertyChangeHandler *);
+  ::javax::swing::plaf::basic::BasicMenuBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuBarUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuBarUI.h b/libjava/javax/swing/plaf/basic/BasicMenuBarUI.h
new file mode 100644
index 000000000..27b85de90
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuBarUI.h
@@ -0,0 +1,93 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuBarUI__
+#define __javax_swing_plaf_basic_BasicMenuBarUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/MenuBarUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+      namespace event
+      {
+          class ContainerListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ActionMap;
+        class JComponent;
+        class JMenuBar;
+      namespace event
+      {
+          class ChangeListener;
+          class MouseInputListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicMenuBarUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuBarUI : public ::javax::swing::plaf::MenuBarUI
+{
+
+public:
+  BasicMenuBarUI();
+public: // actually protected
+  virtual ::javax::swing::event::ChangeListener * createChangeListener();
+  virtual ::java::awt::event::ContainerListener * createContainerListener();
+public:
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installDefaults();
+  virtual void installKeyboardActions();
+private:
+  ::javax::swing::ActionMap * getActionMap();
+  ::javax::swing::ActionMap * createDefaultActions();
+public: // actually protected
+  virtual void installListeners();
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void uninstallDefaults();
+  virtual void uninstallKeyboardActions();
+  virtual void uninstallListeners();
+public:
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  ::javax::swing::event::ChangeListener * __attribute__((aligned(__alignof__( ::javax::swing::plaf::MenuBarUI)))) changeListener;
+  ::java::awt::event::ContainerListener * containerListener;
+private:
+  ::java::beans::PropertyChangeListener * propertyChangeListener;
+public: // actually protected
+  ::javax::swing::JMenuBar * menuBar;
+private:
+  ::javax::swing::event::MouseInputListener * mouseListener;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuBarUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$ClickAction.h b/libjava/javax/swing/plaf/basic/BasicMenuItemUI$ClickAction.h
new file mode 100644
index 000000000..ffdf9672a
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuItemUI$ClickAction.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuItemUI$ClickAction__
+#define __javax_swing_plaf_basic_BasicMenuItemUI$ClickAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicMenuItemUI;
+            class BasicMenuItemUI$ClickAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuItemUI$ClickAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicMenuItemUI$ClickAction(::javax::swing::plaf::basic::BasicMenuItemUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicMenuItemUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuItemUI$ClickAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$ItemHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuItemUI$ItemHandler.h
new file mode 100644
index 000000000..f2746bf14
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuItemUI$ItemHandler.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuItemUI$ItemHandler__
+#define __javax_swing_plaf_basic_BasicMenuItemUI$ItemHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ItemEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicMenuItemUI;
+            class BasicMenuItemUI$ItemHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuItemUI$ItemHandler : public ::java::lang::Object
+{
+
+  BasicMenuItemUI$ItemHandler(::javax::swing::plaf::basic::BasicMenuItemUI *);
+public:
+  virtual void itemStateChanged(::java::awt::event::ItemEvent *);
+public: // actually package-private
+  BasicMenuItemUI$ItemHandler(::javax::swing::plaf::basic::BasicMenuItemUI *, ::javax::swing::plaf::basic::BasicMenuItemUI$ItemHandler *);
+  ::javax::swing::plaf::basic::BasicMenuItemUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuItemUI$ItemHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MenuDragMouseHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MenuDragMouseHandler.h
new file mode 100644
index 000000000..775a4f78c
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MenuDragMouseHandler.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuItemUI$MenuDragMouseHandler__
+#define __javax_swing_plaf_basic_BasicMenuItemUI$MenuDragMouseHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class MenuDragMouseEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicMenuItemUI;
+            class BasicMenuItemUI$MenuDragMouseHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuItemUI$MenuDragMouseHandler : public ::java::lang::Object
+{
+
+  BasicMenuItemUI$MenuDragMouseHandler(::javax::swing::plaf::basic::BasicMenuItemUI *);
+public:
+  virtual void menuDragMouseDragged(::javax::swing::event::MenuDragMouseEvent *);
+  virtual void menuDragMouseEntered(::javax::swing::event::MenuDragMouseEvent *);
+  virtual void menuDragMouseExited(::javax::swing::event::MenuDragMouseEvent *);
+  virtual void menuDragMouseReleased(::javax::swing::event::MenuDragMouseEvent *);
+public: // actually package-private
+  BasicMenuItemUI$MenuDragMouseHandler(::javax::swing::plaf::basic::BasicMenuItemUI *, ::javax::swing::plaf::basic::BasicMenuItemUI$MenuDragMouseHandler *);
+  ::javax::swing::plaf::basic::BasicMenuItemUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuItemUI$MenuDragMouseHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MenuKeyHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MenuKeyHandler.h
new file mode 100644
index 000000000..db70c21c6
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MenuKeyHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuItemUI$MenuKeyHandler__
+#define __javax_swing_plaf_basic_BasicMenuItemUI$MenuKeyHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class MenuKeyEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicMenuItemUI;
+            class BasicMenuItemUI$MenuKeyHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuItemUI$MenuKeyHandler : public ::java::lang::Object
+{
+
+  BasicMenuItemUI$MenuKeyHandler(::javax::swing::plaf::basic::BasicMenuItemUI *);
+public:
+  virtual void menuKeyPressed(::javax::swing::event::MenuKeyEvent *);
+  virtual void menuKeyReleased(::javax::swing::event::MenuKeyEvent *);
+  virtual void menuKeyTyped(::javax::swing::event::MenuKeyEvent *);
+public: // actually package-private
+  BasicMenuItemUI$MenuKeyHandler(::javax::swing::plaf::basic::BasicMenuItemUI *, ::javax::swing::plaf::basic::BasicMenuItemUI$MenuKeyHandler *);
+  ::javax::swing::plaf::basic::BasicMenuItemUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuItemUI$MenuKeyHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MouseInputHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MouseInputHandler.h
new file mode 100644
index 000000000..6f735f393
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MouseInputHandler.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuItemUI$MouseInputHandler__
+#define __javax_swing_plaf_basic_BasicMenuItemUI$MouseInputHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicMenuItemUI;
+            class BasicMenuItemUI$MouseInputHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuItemUI$MouseInputHandler : public ::java::lang::Object
+{
+
+public: // actually protected
+  BasicMenuItemUI$MouseInputHandler(::javax::swing::plaf::basic::BasicMenuItemUI *);
+public:
+  virtual void mouseClicked(::java::awt::event::MouseEvent *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+  virtual void mouseEntered(::java::awt::event::MouseEvent *);
+  virtual void mouseExited(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicMenuItemUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuItemUI$MouseInputHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuItemUI$PropertyChangeHandler.h
new file mode 100644
index 000000000..203bd6576
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuItemUI$PropertyChangeHandler.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuItemUI$PropertyChangeHandler__
+#define __javax_swing_plaf_basic_BasicMenuItemUI$PropertyChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicMenuItemUI;
+            class BasicMenuItemUI$PropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuItemUI$PropertyChangeHandler : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicMenuItemUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicMenuItemUI *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicMenuItemUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuItemUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuItemUI.h b/libjava/javax/swing/plaf/basic/BasicMenuItemUI.h
new file mode 100644
index 000000000..c602c2310
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuItemUI.h
@@ -0,0 +1,132 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuItemUI__
+#define __javax_swing_plaf_basic_BasicMenuItemUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/MenuItemUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Dimension;
+        class Font;
+        class Graphics;
+        class Rectangle;
+      namespace event
+      {
+          class ItemListener;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+        class JComponent;
+        class JMenuItem;
+        class MenuElement;
+        class MenuSelectionManager;
+      namespace event
+      {
+          class MenuDragMouseListener;
+          class MenuKeyListener;
+          class MouseInputListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicMenuItemUI;
+            class BasicMenuItemUI$PropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuItemUI : public ::javax::swing::plaf::MenuItemUI
+{
+
+public:
+  BasicMenuItemUI();
+public: // actually protected
+  virtual ::javax::swing::event::MenuDragMouseListener * createMenuDragMouseListener(::javax::swing::JComponent *);
+  virtual ::javax::swing::event::MenuKeyListener * createMenuKeyListener(::javax::swing::JComponent *);
+  virtual ::javax::swing::event::MouseInputListener * createMouseInputListener(::javax::swing::JComponent *);
+public:
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void doClick(::javax::swing::MenuSelectionManager *);
+public:
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::MenuElement * > * getPath();
+public: // actually protected
+  virtual ::java::awt::Dimension * getPreferredMenuItemSize(::javax::swing::JComponent *, ::javax::swing::Icon *, ::javax::swing::Icon *, jint);
+public:
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::lang::String * getPropertyPrefix();
+  virtual void installComponents(::javax::swing::JMenuItem *);
+  virtual void installDefaults();
+  virtual void installKeyboardActions();
+  virtual void installListeners();
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+public: // actually protected
+  virtual void paintBackground(::java::awt::Graphics *, ::javax::swing::JMenuItem *, ::java::awt::Color *);
+  virtual void paintMenuItem(::java::awt::Graphics *, ::javax::swing::JComponent *, ::javax::swing::Icon *, ::javax::swing::Icon *, ::java::awt::Color *, ::java::awt::Color *, jint);
+  virtual void paintText(::java::awt::Graphics *, ::javax::swing::JMenuItem *, ::java::awt::Rectangle *, ::java::lang::String *);
+  virtual void uninstallComponents(::javax::swing::JMenuItem *);
+  virtual void uninstallDefaults();
+  virtual void uninstallKeyboardActions();
+  virtual void uninstallListeners();
+public:
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+private:
+  ::java::lang::String * getAcceleratorString(::javax::swing::JMenuItem *);
+  void resetRectangles(::javax::swing::JMenuItem *);
+  void layoutMenuItem(::javax::swing::JMenuItem *, ::java::lang::String *);
+public: // actually protected
+  ::java::awt::Font * __attribute__((aligned(__alignof__( ::javax::swing::plaf::MenuItemUI)))) acceleratorFont;
+  ::java::awt::Color * acceleratorForeground;
+  ::java::awt::Color * acceleratorSelectionForeground;
+  ::javax::swing::Icon * arrowIcon;
+  ::javax::swing::Icon * checkIcon;
+  jint defaultTextIconGap;
+  ::java::awt::Color * disabledForeground;
+  ::javax::swing::event::MenuDragMouseListener * menuDragMouseListener;
+  ::javax::swing::JMenuItem * menuItem;
+  ::javax::swing::event::MenuKeyListener * menuKeyListener;
+  ::javax::swing::event::MouseInputListener * mouseInputListener;
+  jboolean oldBorderPainted;
+  ::java::awt::Color * selectionBackground;
+  ::java::awt::Color * selectionForeground;
+private:
+  ::java::lang::String * acceleratorDelimiter;
+  ::java::awt::event::ItemListener * itemListener;
+  ::javax::swing::plaf::basic::BasicMenuItemUI$PropertyChangeHandler * propertyChangeListener;
+  ::java::awt::Rectangle * viewRect;
+  ::java::awt::Rectangle * textRect;
+  ::java::awt::Rectangle * accelRect;
+  ::java::awt::Rectangle * iconRect;
+  ::java::awt::Rectangle * arrowIconRect;
+  ::java::awt::Rectangle * checkIconRect;
+  ::java::awt::Rectangle * cachedRect;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuItemUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuUI$ChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuUI$ChangeHandler.h
new file mode 100644
index 000000000..44eeca121
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuUI$ChangeHandler.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuUI$ChangeHandler__
+#define __javax_swing_plaf_basic_BasicMenuUI$ChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JMenu;
+      namespace event
+      {
+          class ChangeEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicMenuUI;
+            class BasicMenuUI$ChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuUI$ChangeHandler : public ::java::lang::Object
+{
+
+public:
+  BasicMenuUI$ChangeHandler(::javax::swing::plaf::basic::BasicMenuUI *, ::javax::swing::JMenu *, ::javax::swing::plaf::basic::BasicMenuUI *);
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) isSelected;
+  ::javax::swing::JMenu * menu;
+  ::javax::swing::plaf::basic::BasicMenuUI * ui;
+  ::java::awt::Component * wasFocused;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicMenuUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuUI$ChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuDragMouseHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuDragMouseHandler.h
new file mode 100644
index 000000000..39cc8f9f8
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuDragMouseHandler.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuUI$MenuDragMouseHandler__
+#define __javax_swing_plaf_basic_BasicMenuUI$MenuDragMouseHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class MenuDragMouseEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicMenuUI;
+            class BasicMenuUI$MenuDragMouseHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuUI$MenuDragMouseHandler : public ::java::lang::Object
+{
+
+  BasicMenuUI$MenuDragMouseHandler(::javax::swing::plaf::basic::BasicMenuUI *);
+public:
+  virtual void menuDragMouseDragged(::javax::swing::event::MenuDragMouseEvent *);
+  virtual void menuDragMouseEntered(::javax::swing::event::MenuDragMouseEvent *);
+  virtual void menuDragMouseExited(::javax::swing::event::MenuDragMouseEvent *);
+  virtual void menuDragMouseReleased(::javax::swing::event::MenuDragMouseEvent *);
+public: // actually package-private
+  BasicMenuUI$MenuDragMouseHandler(::javax::swing::plaf::basic::BasicMenuUI *, ::javax::swing::plaf::basic::BasicMenuUI$MenuDragMouseHandler *);
+  ::javax::swing::plaf::basic::BasicMenuUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuUI$MenuDragMouseHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuHandler.h
new file mode 100644
index 000000000..eb519164d
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuUI$MenuHandler__
+#define __javax_swing_plaf_basic_BasicMenuUI$MenuHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class MenuEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicMenuUI;
+            class BasicMenuUI$MenuHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuUI$MenuHandler : public ::java::lang::Object
+{
+
+  BasicMenuUI$MenuHandler(::javax::swing::plaf::basic::BasicMenuUI *);
+public:
+  virtual void menuCanceled(::javax::swing::event::MenuEvent *);
+  virtual void menuDeselected(::javax::swing::event::MenuEvent *);
+  virtual void menuSelected(::javax::swing::event::MenuEvent *);
+public: // actually package-private
+  BasicMenuUI$MenuHandler(::javax::swing::plaf::basic::BasicMenuUI *, ::javax::swing::plaf::basic::BasicMenuUI$MenuHandler *);
+  ::javax::swing::plaf::basic::BasicMenuUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuUI$MenuHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuKeyHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuKeyHandler.h
new file mode 100644
index 000000000..be2f9ca15
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuKeyHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuUI$MenuKeyHandler__
+#define __javax_swing_plaf_basic_BasicMenuUI$MenuKeyHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class MenuKeyEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicMenuUI;
+            class BasicMenuUI$MenuKeyHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuUI$MenuKeyHandler : public ::java::lang::Object
+{
+
+  BasicMenuUI$MenuKeyHandler(::javax::swing::plaf::basic::BasicMenuUI *);
+public:
+  virtual void menuKeyPressed(::javax::swing::event::MenuKeyEvent *);
+  virtual void menuKeyReleased(::javax::swing::event::MenuKeyEvent *);
+  virtual void menuKeyTyped(::javax::swing::event::MenuKeyEvent *);
+public: // actually package-private
+  BasicMenuUI$MenuKeyHandler(::javax::swing::plaf::basic::BasicMenuUI *, ::javax::swing::plaf::basic::BasicMenuUI$MenuKeyHandler *);
+  ::javax::swing::plaf::basic::BasicMenuUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuUI$MenuKeyHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuUI$MouseInputHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuUI$MouseInputHandler.h
new file mode 100644
index 000000000..c5e1e4064
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuUI$MouseInputHandler.h
@@ -0,0 +1,60 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuUI$MouseInputHandler__
+#define __javax_swing_plaf_basic_BasicMenuUI$MouseInputHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicMenuUI;
+            class BasicMenuUI$MouseInputHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuUI$MouseInputHandler : public ::java::lang::Object
+{
+
+public: // actually protected
+  BasicMenuUI$MouseInputHandler(::javax::swing::plaf::basic::BasicMenuUI *);
+public:
+  virtual void mouseClicked(::java::awt::event::MouseEvent *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+private:
+  jboolean popupVisible();
+public:
+  virtual void mouseEntered(::java::awt::event::MouseEvent *);
+  virtual void mouseExited(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicMenuUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuUI$MouseInputHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuUI$SelectMenuAction.h b/libjava/javax/swing/plaf/basic/BasicMenuUI$SelectMenuAction.h
new file mode 100644
index 000000000..978157752
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuUI$SelectMenuAction.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuUI$SelectMenuAction__
+#define __javax_swing_plaf_basic_BasicMenuUI$SelectMenuAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicMenuUI;
+            class BasicMenuUI$SelectMenuAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuUI$SelectMenuAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicMenuUI$SelectMenuAction(::javax::swing::plaf::basic::BasicMenuUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicMenuUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuUI$SelectMenuAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuUI.h b/libjava/javax/swing/plaf/basic/BasicMenuUI.h
new file mode 100644
index 000000000..d3ae59e35
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicMenuUI.h
@@ -0,0 +1,80 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicMenuUI__
+#define __javax_swing_plaf_basic_BasicMenuUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicMenuItemUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class JMenu;
+      namespace event
+      {
+          class ChangeListener;
+          class MenuDragMouseListener;
+          class MenuKeyListener;
+          class MenuListener;
+          class MouseInputListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicMenuUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicMenuUI : public ::javax::swing::plaf::basic::BasicMenuItemUI
+{
+
+public:
+  BasicMenuUI();
+public: // actually protected
+  virtual ::javax::swing::event::ChangeListener * createChangeListener(::javax::swing::JComponent *);
+  virtual ::javax::swing::event::MenuDragMouseListener * createMenuDragMouseListener(::javax::swing::JComponent *);
+  virtual ::javax::swing::event::MenuKeyListener * createMenuKeyListener(::javax::swing::JComponent *);
+  virtual ::javax::swing::event::MenuListener * createMenuListener(::javax::swing::JComponent *);
+  virtual ::javax::swing::event::MouseInputListener * createMouseInputListener(::javax::swing::JComponent *);
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener(::javax::swing::JComponent *);
+public:
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::lang::String * getPropertyPrefix();
+  virtual void installDefaults();
+  virtual void installKeyboardActions();
+  virtual void installListeners();
+  virtual void setupPostTimer(::javax::swing::JMenu *);
+  virtual void uninstallDefaults();
+  virtual void uninstallKeyboardActions();
+  virtual void uninstallListeners();
+  ::javax::swing::event::ChangeListener * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicMenuItemUI)))) changeListener;
+  ::javax::swing::event::MenuListener * menuListener;
+  ::java::beans::PropertyChangeListener * propertyChangeListener;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicMenuUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$1.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$1.h
new file mode 100644
index 000000000..644bb97c2
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$1.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI$1__
+#define __javax_swing_plaf_basic_BasicOptionPaneUI$1__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicOptionPaneUI$MessageIcon.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicOptionPaneUI$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicOptionPaneUI$1 : public ::javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon
+{
+
+public: // actually package-private
+  BasicOptionPaneUI$1();
+public:
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicOptionPaneUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$2.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$2.h
new file mode 100644
index 000000000..81a375732
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$2.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI$2__
+#define __javax_swing_plaf_basic_BasicOptionPaneUI$2__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicOptionPaneUI$MessageIcon.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicOptionPaneUI$2;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicOptionPaneUI$2 : public ::javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon
+{
+
+public: // actually package-private
+  BasicOptionPaneUI$2();
+public:
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicOptionPaneUI$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$3.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$3.h
new file mode 100644
index 000000000..febfc6bde
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$3.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI$3__
+#define __javax_swing_plaf_basic_BasicOptionPaneUI$3__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicOptionPaneUI$MessageIcon.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicOptionPaneUI$3;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicOptionPaneUI$3 : public ::javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon
+{
+
+public: // actually package-private
+  BasicOptionPaneUI$3();
+public:
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicOptionPaneUI$3__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$4.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$4.h
new file mode 100644
index 000000000..313bc76e5
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$4.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI$4__
+#define __javax_swing_plaf_basic_BasicOptionPaneUI$4__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicOptionPaneUI$MessageIcon.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicOptionPaneUI$4;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicOptionPaneUI$4 : public ::javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon
+{
+
+public: // actually package-private
+  BasicOptionPaneUI$4();
+public:
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicOptionPaneUI$4__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$ButtonActionListener.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$ButtonActionListener.h
new file mode 100644
index 000000000..575b2b79c
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$ButtonActionListener.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI$ButtonActionListener__
+#define __javax_swing_plaf_basic_BasicOptionPaneUI$ButtonActionListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicOptionPaneUI;
+            class BasicOptionPaneUI$ButtonActionListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicOptionPaneUI$ButtonActionListener : public ::java::lang::Object
+{
+
+public:
+  BasicOptionPaneUI$ButtonActionListener(::javax::swing::plaf::basic::BasicOptionPaneUI *, jint);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) buttonIndex;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicOptionPaneUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicOptionPaneUI$ButtonActionListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$ButtonAreaLayout.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$ButtonAreaLayout.h
new file mode 100644
index 000000000..06671ddd4
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$ButtonAreaLayout.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI$ButtonAreaLayout__
+#define __javax_swing_plaf_basic_BasicOptionPaneUI$ButtonAreaLayout__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicOptionPaneUI$ButtonAreaLayout;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicOptionPaneUI$ButtonAreaLayout : public ::java::lang::Object
+{
+
+public:
+  BasicOptionPaneUI$ButtonAreaLayout(jboolean, jint);
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+  virtual jboolean getCentersChildren();
+  virtual jint getPadding();
+  virtual jboolean getSyncAllWidths();
+  virtual void layoutContainer(::java::awt::Container *);
+private:
+  jint buttonRowLength(::java::awt::Container *);
+public:
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  virtual void removeLayoutComponent(::java::awt::Component *);
+  virtual void setCentersChildren(jboolean);
+  virtual void setPadding(jint);
+  virtual void setSyncAllWidths(jboolean);
+public: // actually protected
+  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) centersChildren;
+  jint padding;
+  jboolean syncAllWidths;
+private:
+  jint widthOfWidestButton;
+  jint tallestButton;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicOptionPaneUI$ButtonAreaLayout__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$MessageIcon.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$MessageIcon.h
new file mode 100644
index 000000000..a820f3cbe
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$MessageIcon.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI$MessageIcon__
+#define __javax_swing_plaf_basic_BasicOptionPaneUI$MessageIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicOptionPaneUI$MessageIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon : public ::java::lang::Object
+{
+
+  BasicOptionPaneUI$MessageIcon();
+public:
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+public: // actually package-private
+  BasicOptionPaneUI$MessageIcon(::javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicOptionPaneUI$MessageIcon__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$OptionPaneCloseAction.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$OptionPaneCloseAction.h
new file mode 100644
index 000000000..81dcc99f3
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$OptionPaneCloseAction.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI$OptionPaneCloseAction__
+#define __javax_swing_plaf_basic_BasicOptionPaneUI$OptionPaneCloseAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicOptionPaneUI$OptionPaneCloseAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicOptionPaneUI$OptionPaneCloseAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicOptionPaneUI$OptionPaneCloseAction();
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicOptionPaneUI$OptionPaneCloseAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$PropertyChangeHandler.h
new file mode 100644
index 000000000..02b236c47
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$PropertyChangeHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI$PropertyChangeHandler__
+#define __javax_swing_plaf_basic_BasicOptionPaneUI$PropertyChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicOptionPaneUI;
+            class BasicOptionPaneUI$PropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicOptionPaneUI$PropertyChangeHandler : public ::java::lang::Object
+{
+
+public:
+  BasicOptionPaneUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicOptionPaneUI *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicOptionPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicOptionPaneUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI.h
new file mode 100644
index 000000000..50aa3b4ee
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI.h
@@ -0,0 +1,148 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI__
+#define __javax_swing_plaf_basic_BasicOptionPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/OptionPaneUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+        class GridBagConstraints;
+        class LayoutManager;
+      namespace event
+      {
+          class ActionListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ActionMap;
+        class Icon;
+        class JComponent;
+        class JLabel;
+        class JOptionPane;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicOptionPaneUI;
+            class BasicOptionPaneUI$MessageIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicOptionPaneUI : public ::javax::swing::plaf::OptionPaneUI
+{
+
+public:
+  BasicOptionPaneUI();
+public: // actually protected
+  virtual void addButtonComponents(::java::awt::Container *, JArray< ::java::lang::Object * > *, jint);
+  virtual void addIcon(::java::awt::Container *);
+private:
+  static ::java::awt::GridBagConstraints * createConstraints();
+public: // actually protected
+  virtual void addMessageComponents(::java::awt::Container *, ::java::awt::GridBagConstraints *, ::java::lang::Object *, jint, jboolean);
+  virtual void burstStringInto(::java::awt::Container *, ::java::lang::String *, jint);
+public:
+  virtual jboolean containsCustomComponents(::javax::swing::JOptionPane *);
+public: // actually protected
+  virtual ::java::awt::event::ActionListener * createButtonActionListener(jint);
+  virtual ::java::awt::Container * createButtonArea();
+  virtual ::java::awt::LayoutManager * createLayoutManager();
+  virtual ::java::awt::Container * createMessageArea();
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
+  virtual ::java::awt::Container * createSeparator();
+public:
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual JArray< ::java::lang::Object * > * getButtons();
+  virtual ::javax::swing::Icon * getIcon();
+  virtual ::javax::swing::Icon * getIconForType(jint);
+  virtual jint getInitialValueIndex();
+  virtual jint getMaxCharactersPerLineCount();
+public:
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::lang::Object * getMessage();
+public:
+  virtual ::java::awt::Dimension * getMinimumOptionPaneSize();
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+public: // actually protected
+  virtual jboolean getSizeButtonsToSameWidth();
+  virtual void installComponents();
+  virtual void installDefaults();
+  virtual void installKeyboardActions();
+private:
+  ::javax::swing::ActionMap * getActionMap();
+  ::javax::swing::ActionMap * createDefaultActions();
+public: // actually protected
+  virtual void installListeners();
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void resetInputValue();
+public:
+  virtual void selectInitialValue(::javax::swing::JOptionPane *);
+public: // actually package-private
+  virtual void resetSelectedValue();
+public: // actually protected
+  virtual void uninstallComponents();
+  virtual void uninstallDefaults();
+  virtual void uninstallKeyboardActions();
+  virtual void uninstallListeners();
+public:
+  virtual void uninstallUI(::javax::swing::JComponent *);
+private:
+  void configureLabel(::javax::swing::JLabel *);
+public:
+  static const jint MinimumWidth = 262;
+  static const jint MinimumHeight = 90;
+public: // actually protected
+  jboolean __attribute__((aligned(__alignof__( ::javax::swing::plaf::OptionPaneUI)))) hasCustomComponents;
+  ::java::awt::Component * initialFocusComponent;
+  ::javax::swing::JComponent * inputComponent;
+  ::java::awt::Dimension * minimumSize;
+  ::java::beans::PropertyChangeListener * propertyChangeListener;
+  ::javax::swing::JOptionPane * optionPane;
+private:
+  static const jint ICON_SIZE = 36;
+  static ::java::lang::String * OK_STRING;
+  static ::java::lang::String * YES_STRING;
+  static ::java::lang::String * NO_STRING;
+  static ::java::lang::String * CANCEL_STRING;
+public: // actually package-private
+  ::java::awt::Container * messageAreaContainer;
+  ::java::awt::Container * buttonContainer;
+private:
+  static ::javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon * errorIcon;
+  static ::javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon * infoIcon;
+  static ::javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon * warningIcon;
+  static ::javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon * questionIcon;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicOptionPaneUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicPanelUI.h b/libjava/javax/swing/plaf/basic/BasicPanelUI.h
new file mode 100644
index 000000000..5fcf6fe89
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicPanelUI.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicPanelUI__
+#define __javax_swing_plaf_basic_BasicPanelUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/PanelUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class JPanel;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicPanelUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicPanelUI : public ::javax::swing::plaf::PanelUI
+{
+
+public:
+  BasicPanelUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installDefaults(::javax::swing::JPanel *);
+public:
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void uninstallDefaults(::javax::swing::JPanel *);
+public: // actually package-private
+  static ::javax::swing::plaf::basic::BasicPanelUI * sharedUI;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicPanelUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicPasswordFieldUI.h b/libjava/javax/swing/plaf/basic/BasicPasswordFieldUI.h
new file mode 100644
index 000000000..fcbb8732f
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicPasswordFieldUI.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicPasswordFieldUI__
+#define __javax_swing_plaf_basic_BasicPasswordFieldUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicTextFieldUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicPasswordFieldUI;
+        }
+      }
+      namespace text
+      {
+          class Element;
+          class View;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicPasswordFieldUI : public ::javax::swing::plaf::basic::BasicTextFieldUI
+{
+
+public:
+  BasicPasswordFieldUI();
+  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *);
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::lang::String * getPropertyPrefix();
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicPasswordFieldUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.h b/libjava/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.h
new file mode 100644
index 000000000..d5082f9d1
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicPopupMenuSeparatorUI__
+#define __javax_swing_plaf_basic_BasicPopupMenuSeparatorUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicSeparatorUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicPopupMenuSeparatorUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicPopupMenuSeparatorUI : public ::javax::swing::plaf::basic::BasicSeparatorUI
+{
+
+public:
+  BasicPopupMenuSeparatorUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicPopupMenuSeparatorUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$KeyboardHelper.h b/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$KeyboardHelper.h
new file mode 100644
index 000000000..5fb04078a
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$KeyboardHelper.h
@@ -0,0 +1,65 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicPopupMenuUI$KeyboardHelper__
+#define __javax_swing_plaf_basic_BasicPopupMenuUI$KeyboardHelper__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JPopupMenu;
+        class JRootPane;
+        class MenuElement;
+      namespace event
+      {
+          class ChangeEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicPopupMenuUI;
+            class BasicPopupMenuUI$KeyboardHelper;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicPopupMenuUI$KeyboardHelper : public ::java::lang::Object
+{
+
+  BasicPopupMenuUI$KeyboardHelper(::javax::swing::plaf::basic::BasicPopupMenuUI *);
+public:
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+private:
+  ::javax::swing::JPopupMenu * getActivePopup(JArray< ::javax::swing::MenuElement * > *);
+  jboolean invokerEquals(::javax::swing::MenuElement *, ::javax::swing::MenuElement *);
+public: // actually package-private
+  BasicPopupMenuUI$KeyboardHelper(::javax::swing::plaf::basic::BasicPopupMenuUI *, ::javax::swing::plaf::basic::BasicPopupMenuUI$KeyboardHelper *);
+private:
+  JArray< ::javax::swing::MenuElement * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) lastSelectedPath;
+  ::java::awt::Component * lastFocused;
+  ::javax::swing::JRootPane * invokerRootPane;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicPopupMenuUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicPopupMenuUI$KeyboardHelper__
diff --git a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$NavigateAction.h b/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$NavigateAction.h
new file mode 100644
index 000000000..03fb5accb
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$NavigateAction.h
@@ -0,0 +1,64 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicPopupMenuUI$NavigateAction__
+#define __javax_swing_plaf_basic_BasicPopupMenuUI$NavigateAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JPopupMenu;
+        class MenuElement;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicPopupMenuUI$NavigateAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicPopupMenuUI$NavigateAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicPopupMenuUI$NavigateAction(::java::lang::String *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+private:
+  void navigateNextPrevious(jboolean);
+  ::javax::swing::MenuElement * findEnabledChild(JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuElement *, jboolean);
+  ::javax::swing::MenuElement * findEnabledChild(JArray< ::javax::swing::MenuElement * > *, jint, jboolean);
+  ::javax::swing::MenuElement * findNextEnabledChild(JArray< ::javax::swing::MenuElement * > *, jint, jint);
+  ::javax::swing::MenuElement * findPreviousEnabledChild(JArray< ::javax::swing::MenuElement * > *, jint, jint);
+  void navigateParentChild(jboolean);
+  void cancel();
+  ::javax::swing::JPopupMenu * getLastPopup();
+  void doReturn();
+public: // actually package-private
+  static jboolean $assertionsDisabled;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicPopupMenuUI$NavigateAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$PopupMenuHandler.h b/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$PopupMenuHandler.h
new file mode 100644
index 000000000..3b8b580ab
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$PopupMenuHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicPopupMenuUI$PopupMenuHandler__
+#define __javax_swing_plaf_basic_BasicPopupMenuUI$PopupMenuHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class PopupMenuEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicPopupMenuUI;
+            class BasicPopupMenuUI$PopupMenuHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicPopupMenuUI$PopupMenuHandler : public ::java::lang::Object
+{
+
+  BasicPopupMenuUI$PopupMenuHandler(::javax::swing::plaf::basic::BasicPopupMenuUI *);
+public:
+  virtual void popupMenuCanceled(::javax::swing::event::PopupMenuEvent *);
+  virtual void popupMenuWillBecomeInvisible(::javax::swing::event::PopupMenuEvent *);
+  virtual void popupMenuWillBecomeVisible(::javax::swing::event::PopupMenuEvent *);
+public: // actually package-private
+  BasicPopupMenuUI$PopupMenuHandler(::javax::swing::plaf::basic::BasicPopupMenuUI *, ::javax::swing::plaf::basic::BasicPopupMenuUI$PopupMenuHandler *);
+  ::javax::swing::plaf::basic::BasicPopupMenuUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicPopupMenuUI$PopupMenuHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$TopWindowListener.h b/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$TopWindowListener.h
new file mode 100644
index 000000000..e88a2f884
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$TopWindowListener.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicPopupMenuUI$TopWindowListener__
+#define __javax_swing_plaf_basic_BasicPopupMenuUI$TopWindowListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ComponentEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicPopupMenuUI;
+            class BasicPopupMenuUI$TopWindowListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicPopupMenuUI$TopWindowListener : public ::java::lang::Object
+{
+
+  BasicPopupMenuUI$TopWindowListener(::javax::swing::plaf::basic::BasicPopupMenuUI *);
+public:
+  virtual void componentResized(::java::awt::event::ComponentEvent *);
+  virtual void componentMoved(::java::awt::event::ComponentEvent *);
+  virtual void componentShown(::java::awt::event::ComponentEvent *);
+  virtual void componentHidden(::java::awt::event::ComponentEvent *);
+public: // actually package-private
+  BasicPopupMenuUI$TopWindowListener(::javax::swing::plaf::basic::BasicPopupMenuUI *, ::javax::swing::plaf::basic::BasicPopupMenuUI$TopWindowListener *);
+  ::javax::swing::plaf::basic::BasicPopupMenuUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicPopupMenuUI$TopWindowListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI.h b/libjava/javax/swing/plaf/basic/BasicPopupMenuUI.h
new file mode 100644
index 000000000..95bf37a93
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicPopupMenuUI.h
@@ -0,0 +1,90 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicPopupMenuUI__
+#define __javax_swing_plaf_basic_BasicPopupMenuUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/PopupMenuUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ActionMap;
+        class JComponent;
+        class JPopupMenu;
+      namespace event
+      {
+          class PopupMenuListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicPopupMenuUI;
+            class BasicPopupMenuUI$KeyboardHelper;
+            class BasicPopupMenuUI$TopWindowListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicPopupMenuUI : public ::javax::swing::plaf::PopupMenuUI
+{
+
+public:
+  BasicPopupMenuUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void installDefaults();
+public: // actually protected
+  virtual void installListeners();
+  virtual void installKeyboardActions();
+public: // actually package-private
+  virtual void installKeyboardActionsImpl();
+private:
+  ::javax::swing::ActionMap * getActionMap();
+  ::javax::swing::ActionMap * createDefaultActions();
+public:
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void uninstallDefaults();
+  virtual void uninstallListeners();
+  virtual void uninstallKeyboardActions();
+public: // actually package-private
+  virtual void uninstallKeyboardActionsImpl();
+public:
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jboolean isPopupTrigger(::java::awt::event::MouseEvent *);
+public: // actually protected
+  ::javax::swing::JPopupMenu * __attribute__((aligned(__alignof__( ::javax::swing::plaf::PopupMenuUI)))) popupMenu;
+private:
+  ::javax::swing::event::PopupMenuListener * popupMenuListener;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicPopupMenuUI$TopWindowListener * topWindowListener;
+private:
+  static jint numPopups;
+  static ::javax::swing::plaf::basic::BasicPopupMenuUI$KeyboardHelper * keyboardHelper;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicPopupMenuUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicProgressBarUI$AncestorHandler.h b/libjava/javax/swing/plaf/basic/BasicProgressBarUI$AncestorHandler.h
new file mode 100644
index 000000000..54768d3a3
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicProgressBarUI$AncestorHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicProgressBarUI$AncestorHandler__
+#define __javax_swing_plaf_basic_BasicProgressBarUI$AncestorHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class AncestorEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicProgressBarUI;
+            class BasicProgressBarUI$AncestorHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicProgressBarUI$AncestorHandler : public ::java::lang::Object
+{
+
+  BasicProgressBarUI$AncestorHandler(::javax::swing::plaf::basic::BasicProgressBarUI *);
+public:
+  virtual void ancestorAdded(::javax::swing::event::AncestorEvent *);
+  virtual void ancestorRemoved(::javax::swing::event::AncestorEvent *);
+  virtual void ancestorMoved(::javax::swing::event::AncestorEvent *);
+public: // actually package-private
+  BasicProgressBarUI$AncestorHandler(::javax::swing::plaf::basic::BasicProgressBarUI *, ::javax::swing::plaf::basic::BasicProgressBarUI$AncestorHandler *);
+  ::javax::swing::plaf::basic::BasicProgressBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicProgressBarUI$AncestorHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicProgressBarUI$Animator.h b/libjava/javax/swing/plaf/basic/BasicProgressBarUI$Animator.h
new file mode 100644
index 000000000..31c00bc61
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicProgressBarUI$Animator.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicProgressBarUI$Animator__
+#define __javax_swing_plaf_basic_BasicProgressBarUI$Animator__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicProgressBarUI;
+            class BasicProgressBarUI$Animator;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicProgressBarUI$Animator : public ::java::lang::Object
+{
+
+  BasicProgressBarUI$Animator(::javax::swing::plaf::basic::BasicProgressBarUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  BasicProgressBarUI$Animator(::javax::swing::plaf::basic::BasicProgressBarUI *, ::javax::swing::plaf::basic::BasicProgressBarUI$Animator *);
+  ::javax::swing::plaf::basic::BasicProgressBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicProgressBarUI$Animator__
diff --git a/libjava/javax/swing/plaf/basic/BasicProgressBarUI$ChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicProgressBarUI$ChangeHandler.h
new file mode 100644
index 000000000..e8296621a
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicProgressBarUI$ChangeHandler.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicProgressBarUI$ChangeHandler__
+#define __javax_swing_plaf_basic_BasicProgressBarUI$ChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ChangeEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicProgressBarUI;
+            class BasicProgressBarUI$ChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicProgressBarUI$ChangeHandler : public ::java::lang::Object
+{
+
+public:
+  BasicProgressBarUI$ChangeHandler(::javax::swing::plaf::basic::BasicProgressBarUI *);
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicProgressBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicProgressBarUI$ChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicProgressBarUI$ComponentHandler.h b/libjava/javax/swing/plaf/basic/BasicProgressBarUI$ComponentHandler.h
new file mode 100644
index 000000000..2f20e0f24
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicProgressBarUI$ComponentHandler.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicProgressBarUI$ComponentHandler__
+#define __javax_swing_plaf_basic_BasicProgressBarUI$ComponentHandler__
+
+#pragma interface
+
+#include <java/awt/event/ComponentAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ComponentEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicProgressBarUI;
+            class BasicProgressBarUI$ComponentHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicProgressBarUI$ComponentHandler : public ::java::awt::event::ComponentAdapter
+{
+
+  BasicProgressBarUI$ComponentHandler(::javax::swing::plaf::basic::BasicProgressBarUI *);
+public:
+  virtual void componentResized(::java::awt::event::ComponentEvent *);
+public: // actually package-private
+  BasicProgressBarUI$ComponentHandler(::javax::swing::plaf::basic::BasicProgressBarUI *, ::javax::swing::plaf::basic::BasicProgressBarUI$ComponentHandler *);
+  ::javax::swing::plaf::basic::BasicProgressBarUI * __attribute__((aligned(__alignof__( ::java::awt::event::ComponentAdapter)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicProgressBarUI$ComponentHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicProgressBarUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicProgressBarUI$PropertyChangeHandler.h
new file mode 100644
index 000000000..9d0d136fc
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicProgressBarUI$PropertyChangeHandler.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicProgressBarUI$PropertyChangeHandler__
+#define __javax_swing_plaf_basic_BasicProgressBarUI$PropertyChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicProgressBarUI;
+            class BasicProgressBarUI$PropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicProgressBarUI$PropertyChangeHandler : public ::java::lang::Object
+{
+
+  BasicProgressBarUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicProgressBarUI *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  BasicProgressBarUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicProgressBarUI *, ::javax::swing::plaf::basic::BasicProgressBarUI$PropertyChangeHandler *);
+  ::javax::swing::plaf::basic::BasicProgressBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicProgressBarUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicProgressBarUI.h b/libjava/javax/swing/plaf/basic/BasicProgressBarUI.h
new file mode 100644
index 000000000..85263b937
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicProgressBarUI.h
@@ -0,0 +1,123 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicProgressBarUI__
+#define __javax_swing_plaf_basic_BasicProgressBarUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ProgressBarUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Dimension;
+        class Graphics;
+        class Insets;
+        class Point;
+        class Rectangle;
+      namespace event
+      {
+          class ComponentListener;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class JProgressBar;
+        class Timer;
+      namespace event
+      {
+          class AncestorListener;
+          class ChangeListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicProgressBarUI;
+            class BasicProgressBarUI$Animator;
+            class BasicProgressBarUI$PropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicProgressBarUI : public ::javax::swing::plaf::ProgressBarUI
+{
+
+public:
+  BasicProgressBarUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual jint getAmountFull(::java::awt::Insets *, jint, jint);
+  virtual jint getAnimationIndex();
+  virtual ::java::awt::Rectangle * getBox(::java::awt::Rectangle *);
+  virtual jint getCellLength();
+  virtual jint getCellSpacing();
+public:
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::awt::Dimension * getPreferredInnerHorizontal();
+  virtual ::java::awt::Dimension * getPreferredInnerVertical();
+public:
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::awt::Color * getSelectionBackground();
+  virtual ::java::awt::Color * getSelectionForeground();
+  virtual ::java::awt::Point * getStringPlacement(::java::awt::Graphics *, ::java::lang::String *, jint, jint, jint, jint);
+  virtual void incrementAnimationIndex();
+public:
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+public: // actually protected
+  virtual void paintDeterminate(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paintIndeterminate(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paintString(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::awt::Insets *);
+  virtual void setAnimationIndex(jint);
+  virtual void setCellLength(jint);
+  virtual void setCellSpacing(jint);
+  virtual void startAnimationTimer();
+  virtual void stopAnimationTimer();
+  virtual void installDefaults();
+  virtual void uninstallDefaults();
+  virtual void installListeners();
+  virtual void uninstallListeners();
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  ::java::awt::Rectangle * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ProgressBarUI)))) boxRect;
+private:
+  ::javax::swing::Timer * animationTimer;
+  jint animationIndex;
+  jint numFrames;
+  ::javax::swing::plaf::basic::BasicProgressBarUI$Animator * animation;
+  ::javax::swing::plaf::basic::BasicProgressBarUI$PropertyChangeHandler * propertyListener;
+public: // actually protected
+  ::javax::swing::event::ChangeListener * changeListener;
+  ::javax::swing::JProgressBar * progressBar;
+public: // actually package-private
+  jdouble boxDependent;
+  jint boxIndependent;
+  jdouble incr;
+private:
+  jint cellLength;
+  jint cellSpacing;
+  ::java::awt::Color * selectionBackground;
+  ::java::awt::Color * selectionForeground;
+  ::javax::swing::event::AncestorListener * ancestorListener;
+  ::java::awt::event::ComponentListener * componentListener;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicProgressBarUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.h b/libjava/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.h
new file mode 100644
index 000000000..5439b6722
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicRadioButtonMenuItemUI__
+#define __javax_swing_plaf_basic_BasicRadioButtonMenuItemUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicMenuItemUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class JMenuItem;
+        class MenuElement;
+        class MenuSelectionManager;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicRadioButtonMenuItemUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicRadioButtonMenuItemUI : public ::javax::swing::plaf::basic::BasicMenuItemUI
+{
+
+public:
+  BasicRadioButtonMenuItemUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::lang::String * getPropertyPrefix();
+public:
+  virtual void processMouseEvent(::javax::swing::JMenuItem *, ::java::awt::event::MouseEvent *, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicRadioButtonMenuItemUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicRadioButtonUI.h b/libjava/javax/swing/plaf/basic/BasicRadioButtonUI.h
new file mode 100644
index 000000000..deea38585
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicRadioButtonUI.h
@@ -0,0 +1,63 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicRadioButtonUI__
+#define __javax_swing_plaf_basic_BasicRadioButtonUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicToggleButtonUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class AbstractButton;
+        class Icon;
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicRadioButtonUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicRadioButtonUI : public ::javax::swing::plaf::basic::BasicToggleButtonUI
+{
+
+public:
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  BasicRadioButtonUI();
+public: // actually protected
+  virtual void installDefaults(::javax::swing::AbstractButton *);
+  virtual ::java::lang::String * getPropertyPrefix();
+public:
+  virtual ::javax::swing::Icon * getDefaultIcon();
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+private:
+  ::javax::swing::Icon * getCurrentIcon(::javax::swing::AbstractButton *);
+public:
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void paintFocus(::java::awt::Graphics *, ::java::awt::Rectangle *, ::java::awt::Dimension *);
+  ::javax::swing::Icon * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicToggleButtonUI)))) icon;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicRadioButtonUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicRootPaneUI$DefaultPressAction.h b/libjava/javax/swing/plaf/basic/BasicRootPaneUI$DefaultPressAction.h
new file mode 100644
index 000000000..040c91502
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicRootPaneUI$DefaultPressAction.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicRootPaneUI$DefaultPressAction__
+#define __javax_swing_plaf_basic_BasicRootPaneUI$DefaultPressAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JRootPane;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicRootPaneUI;
+            class BasicRootPaneUI$DefaultPressAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicRootPaneUI$DefaultPressAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicRootPaneUI$DefaultPressAction(::javax::swing::plaf::basic::BasicRootPaneUI *, ::javax::swing::JRootPane *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+private:
+  ::javax::swing::JRootPane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) rootPane;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicRootPaneUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicRootPaneUI$DefaultPressAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicRootPaneUI$DefaultReleaseAction.h b/libjava/javax/swing/plaf/basic/BasicRootPaneUI$DefaultReleaseAction.h
new file mode 100644
index 000000000..172896092
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicRootPaneUI$DefaultReleaseAction.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicRootPaneUI$DefaultReleaseAction__
+#define __javax_swing_plaf_basic_BasicRootPaneUI$DefaultReleaseAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JRootPane;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicRootPaneUI;
+            class BasicRootPaneUI$DefaultReleaseAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicRootPaneUI$DefaultReleaseAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicRootPaneUI$DefaultReleaseAction(::javax::swing::plaf::basic::BasicRootPaneUI *, ::javax::swing::JRootPane *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+private:
+  ::javax::swing::JRootPane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) rootPane;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicRootPaneUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicRootPaneUI$DefaultReleaseAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicRootPaneUI.h b/libjava/javax/swing/plaf/basic/BasicRootPaneUI.h
new file mode 100644
index 000000000..cf222b76f
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicRootPaneUI.h
@@ -0,0 +1,61 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicRootPaneUI__
+#define __javax_swing_plaf_basic_BasicRootPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/RootPaneUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class JRootPane;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicRootPaneUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicRootPaneUI : public ::javax::swing::plaf::RootPaneUI
+{
+
+public:
+  BasicRootPaneUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installDefaults(::javax::swing::JRootPane *);
+  virtual void installComponents(::javax::swing::JRootPane *);
+  virtual void installListeners(::javax::swing::JRootPane *);
+  virtual void installKeyboardActions(::javax::swing::JRootPane *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void uninstallDefaults(::javax::swing::JRootPane *);
+  virtual void uninstallComponents(::javax::swing::JRootPane *);
+  virtual void uninstallListeners(::javax::swing::JRootPane *);
+  virtual void uninstallKeyboardActions(::javax::swing::JRootPane *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicRootPaneUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$1.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$1.h
new file mode 100644
index 000000000..cd9673d17
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$1.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$1__
+#define __javax_swing_plaf_basic_BasicScrollBarUI$1__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollBarUI;
+            class BasicScrollBarUI$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollBarUI$1 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicScrollBarUI$1(::javax::swing::plaf::basic::BasicScrollBarUI *, ::java::lang::String *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollBarUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$2.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$2.h
new file mode 100644
index 000000000..2d4479ac2
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$2.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$2__
+#define __javax_swing_plaf_basic_BasicScrollBarUI$2__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollBarUI;
+            class BasicScrollBarUI$2;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollBarUI$2 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicScrollBarUI$2(::javax::swing::plaf::basic::BasicScrollBarUI *, ::java::lang::String *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollBarUI$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$3.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$3.h
new file mode 100644
index 000000000..ef2fcc687
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$3.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$3__
+#define __javax_swing_plaf_basic_BasicScrollBarUI$3__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollBarUI;
+            class BasicScrollBarUI$3;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollBarUI$3 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicScrollBarUI$3(::javax::swing::plaf::basic::BasicScrollBarUI *, ::java::lang::String *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollBarUI$3__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$4.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$4.h
new file mode 100644
index 000000000..112745e75
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$4.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$4__
+#define __javax_swing_plaf_basic_BasicScrollBarUI$4__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollBarUI;
+            class BasicScrollBarUI$4;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollBarUI$4 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicScrollBarUI$4(::javax::swing::plaf::basic::BasicScrollBarUI *, ::java::lang::String *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollBarUI$4__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$5.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$5.h
new file mode 100644
index 000000000..7fa7223dc
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$5.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$5__
+#define __javax_swing_plaf_basic_BasicScrollBarUI$5__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollBarUI;
+            class BasicScrollBarUI$5;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollBarUI$5 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicScrollBarUI$5(::javax::swing::plaf::basic::BasicScrollBarUI *, ::java::lang::String *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollBarUI$5__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$6.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$6.h
new file mode 100644
index 000000000..23da9c5f4
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$6.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$6__
+#define __javax_swing_plaf_basic_BasicScrollBarUI$6__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollBarUI;
+            class BasicScrollBarUI$6;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollBarUI$6 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicScrollBarUI$6(::javax::swing::plaf::basic::BasicScrollBarUI *, ::java::lang::String *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollBarUI$6__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ArrowButtonListener.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ArrowButtonListener.h
new file mode 100644
index 000000000..85d942986
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ArrowButtonListener.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$ArrowButtonListener__
+#define __javax_swing_plaf_basic_BasicScrollBarUI$ArrowButtonListener__
+
+#pragma interface
+
+#include <java/awt/event/MouseAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollBarUI;
+            class BasicScrollBarUI$ArrowButtonListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollBarUI$ArrowButtonListener : public ::java::awt::event::MouseAdapter
+{
+
+public: // actually protected
+  BasicScrollBarUI$ArrowButtonListener(::javax::swing::plaf::basic::BasicScrollBarUI *);
+public:
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollBarUI$ArrowButtonListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ModelListener.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ModelListener.h
new file mode 100644
index 000000000..472d5bd4b
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ModelListener.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$ModelListener__
+#define __javax_swing_plaf_basic_BasicScrollBarUI$ModelListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ChangeEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollBarUI;
+            class BasicScrollBarUI$ModelListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollBarUI$ModelListener : public ::java::lang::Object
+{
+
+public: // actually protected
+  BasicScrollBarUI$ModelListener(::javax::swing::plaf::basic::BasicScrollBarUI *);
+public:
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollBarUI$ModelListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$PropertyChangeHandler.h
new file mode 100644
index 000000000..b2afd7163
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$PropertyChangeHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$PropertyChangeHandler__
+#define __javax_swing_plaf_basic_BasicScrollBarUI$PropertyChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollBarUI;
+            class BasicScrollBarUI$PropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollBarUI$PropertyChangeHandler : public ::java::lang::Object
+{
+
+public:
+  BasicScrollBarUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicScrollBarUI *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollBarUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ScrollListener.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ScrollListener.h
new file mode 100644
index 000000000..193e13f59
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ScrollListener.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$ScrollListener__
+#define __javax_swing_plaf_basic_BasicScrollBarUI$ScrollListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollBarUI;
+            class BasicScrollBarUI$ScrollListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollBarUI$ScrollListener : public ::java::lang::Object
+{
+
+public:
+  BasicScrollBarUI$ScrollListener(::javax::swing::plaf::basic::BasicScrollBarUI *);
+  BasicScrollBarUI$ScrollListener(::javax::swing::plaf::basic::BasicScrollBarUI *, jint, jboolean);
+  virtual void setDirection(jint);
+  virtual void setScrollByBlock(jboolean);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+private:
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) direction;
+  jboolean block;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollBarUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollBarUI$ScrollListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$TrackListener.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$TrackListener.h
new file mode 100644
index 000000000..b78648a31
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$TrackListener.h
@@ -0,0 +1,60 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$TrackListener__
+#define __javax_swing_plaf_basic_BasicScrollBarUI$TrackListener__
+
+#pragma interface
+
+#include <java/awt/event/MouseAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollBarUI;
+            class BasicScrollBarUI$TrackListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollBarUI$TrackListener : public ::java::awt::event::MouseAdapter
+{
+
+public: // actually protected
+  BasicScrollBarUI$TrackListener(::javax::swing::plaf::basic::BasicScrollBarUI *);
+public:
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  virtual jboolean shouldScroll(jint);
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) currentMouseX;
+  jint currentMouseY;
+  jint offset;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollBarUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollBarUI$TrackListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI.h
new file mode 100644
index 000000000..64cd923ac
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollBarUI.h
@@ -0,0 +1,174 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollBarUI__
+#define __javax_swing_plaf_basic_BasicScrollBarUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ScrollBarUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Container;
+        class Dimension;
+        class Graphics;
+        class Rectangle;
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ActionMap;
+        class InputMap;
+        class JButton;
+        class JComponent;
+        class JScrollBar;
+        class Timer;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicScrollBarUI;
+            class BasicScrollBarUI$ArrowButtonListener;
+            class BasicScrollBarUI$ModelListener;
+            class BasicScrollBarUI$ScrollListener;
+            class BasicScrollBarUI$TrackListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollBarUI : public ::javax::swing::plaf::ScrollBarUI
+{
+
+public:
+  BasicScrollBarUI();
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+public: // actually protected
+  virtual void configureScrollBarColors();
+  virtual ::javax::swing::plaf::basic::BasicScrollBarUI$ArrowButtonListener * createArrowButtonListener();
+  virtual ::javax::swing::JButton * createIncreaseButton(jint);
+  virtual ::javax::swing::JButton * createDecreaseButton(jint);
+  virtual ::javax::swing::plaf::basic::BasicScrollBarUI$ModelListener * createModelListener();
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
+  virtual ::javax::swing::plaf::basic::BasicScrollBarUI$ScrollListener * createScrollListener();
+  virtual ::javax::swing::plaf::basic::BasicScrollBarUI$TrackListener * createTrackListener();
+public:
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::awt::Dimension * getMaximumThumbSize();
+public:
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::awt::Dimension * getMinimumThumbSize();
+public: // actually package-private
+  virtual void calculatePreferredSize();
+public:
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::awt::Rectangle * getThumbBounds();
+  virtual ::java::awt::Rectangle * getTrackBounds();
+  virtual void installComponents();
+  virtual void installDefaults();
+  virtual void installKeyboardActions();
+  virtual void uninstallKeyboardActions();
+public: // actually package-private
+  virtual ::javax::swing::InputMap * getInputMap(jint);
+  virtual ::javax::swing::ActionMap * getActionMap();
+  virtual ::javax::swing::ActionMap * createActionMap();
+public: // actually protected
+  virtual void installListeners();
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void layoutContainer(::java::awt::Container *);
+public: // actually protected
+  virtual void layoutHScrollbar(::javax::swing::JScrollBar *);
+  virtual void layoutVScrollbar(::javax::swing::JScrollBar *);
+public: // actually package-private
+  virtual void updateThumbRect();
+public:
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+public: // actually protected
+  virtual void paintDecreaseHighlight(::java::awt::Graphics *);
+  virtual void paintIncreaseHighlight(::java::awt::Graphics *);
+  virtual void paintThumb(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *);
+  virtual void paintTrack(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *);
+public:
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  virtual void removeLayoutComponent(::java::awt::Component *);
+public: // actually protected
+  virtual void scrollByBlock(jint);
+public: // actually package-private
+  static void scrollByBlock(::javax::swing::JScrollBar *, jint);
+public: // actually protected
+  virtual void scrollByUnit(jint);
+public: // actually package-private
+  static void scrollByUnits(::javax::swing::JScrollBar *, jint, jint);
+public: // actually protected
+  virtual void setThumbBounds(jint, jint, jint, jint);
+  virtual void uninstallComponents();
+  virtual void uninstallDefaults();
+  virtual void uninstallListeners();
+public:
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually package-private
+  virtual jint valueForYPosition(jint);
+  virtual jint valueForXPosition(jint);
+public:
+  virtual jboolean isThumbRollover();
+public: // actually protected
+  virtual void setThumbRollover(jboolean);
+public:
+  virtual jboolean getSupportsAbsolutePositioning();
+public: // actually protected
+  ::javax::swing::plaf::basic::BasicScrollBarUI$ArrowButtonListener * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ScrollBarUI)))) buttonListener;
+  ::javax::swing::plaf::basic::BasicScrollBarUI$ModelListener * modelListener;
+  ::java::beans::PropertyChangeListener * propertyChangeListener;
+  ::javax::swing::plaf::basic::BasicScrollBarUI$ScrollListener * scrollListener;
+  ::javax::swing::plaf::basic::BasicScrollBarUI$TrackListener * trackListener;
+  ::javax::swing::JButton * decrButton;
+  ::javax::swing::JButton * incrButton;
+  ::java::awt::Dimension * maximumThumbSize;
+  ::java::awt::Dimension * minimumThumbSize;
+  ::java::awt::Color * thumbColor;
+  ::java::awt::Color * thumbDarkShadowColor;
+  ::java::awt::Color * thumbHighlightColor;
+  ::java::awt::Color * thumbLightShadowColor;
+  ::java::awt::Color * trackHighlightColor;
+  ::java::awt::Color * trackColor;
+  ::java::awt::Rectangle * trackRect;
+  ::java::awt::Rectangle * thumbRect;
+  static const jint DECREASE_HIGHLIGHT = 1;
+  static const jint INCREASE_HIGHLIGHT = 2;
+  static const jint NO_HIGHLIGHT = 0;
+private:
+  static const jint POSITIVE_SCROLL = 1;
+  static const jint NEGATIVE_SCROLL = -1;
+  ::java::awt::Dimension * preferredSize;
+public: // actually protected
+  jint trackHighlight;
+  jboolean isDragging;
+  ::javax::swing::Timer * scrollTimer;
+  ::javax::swing::JScrollBar * scrollbar;
+public: // actually package-private
+  jboolean thumbRollover;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollBarUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$1.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$1.h
new file mode 100644
index 000000000..2a7342851
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$1.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$1__
+#define __javax_swing_plaf_basic_BasicScrollPaneUI$1__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollPaneUI;
+            class BasicScrollPaneUI$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollPaneUI$1 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicScrollPaneUI$1(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$10.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$10.h
new file mode 100644
index 000000000..6e112999a
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$10.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$10__
+#define __javax_swing_plaf_basic_BasicScrollPaneUI$10__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollPaneUI;
+            class BasicScrollPaneUI$10;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollPaneUI$10 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicScrollPaneUI$10(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$10__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$2.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$2.h
new file mode 100644
index 000000000..672b7153c
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$2.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$2__
+#define __javax_swing_plaf_basic_BasicScrollPaneUI$2__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollPaneUI;
+            class BasicScrollPaneUI$2;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollPaneUI$2 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicScrollPaneUI$2(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$3.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$3.h
new file mode 100644
index 000000000..f69a2242a
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$3.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$3__
+#define __javax_swing_plaf_basic_BasicScrollPaneUI$3__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollPaneUI;
+            class BasicScrollPaneUI$3;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollPaneUI$3 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicScrollPaneUI$3(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$3__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$4.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$4.h
new file mode 100644
index 000000000..9fabcaa42
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$4.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$4__
+#define __javax_swing_plaf_basic_BasicScrollPaneUI$4__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollPaneUI;
+            class BasicScrollPaneUI$4;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollPaneUI$4 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicScrollPaneUI$4(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$4__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$5.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$5.h
new file mode 100644
index 000000000..22fb657c7
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$5.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$5__
+#define __javax_swing_plaf_basic_BasicScrollPaneUI$5__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollPaneUI;
+            class BasicScrollPaneUI$5;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollPaneUI$5 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicScrollPaneUI$5(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$5__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$6.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$6.h
new file mode 100644
index 000000000..f3d5560c2
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$6.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$6__
+#define __javax_swing_plaf_basic_BasicScrollPaneUI$6__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollPaneUI;
+            class BasicScrollPaneUI$6;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollPaneUI$6 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicScrollPaneUI$6(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$6__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$7.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$7.h
new file mode 100644
index 000000000..b8c2c9513
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$7.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$7__
+#define __javax_swing_plaf_basic_BasicScrollPaneUI$7__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollPaneUI;
+            class BasicScrollPaneUI$7;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollPaneUI$7 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicScrollPaneUI$7(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$7__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$8.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$8.h
new file mode 100644
index 000000000..f68cfa1aa
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$8.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$8__
+#define __javax_swing_plaf_basic_BasicScrollPaneUI$8__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollPaneUI;
+            class BasicScrollPaneUI$8;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollPaneUI$8 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicScrollPaneUI$8(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$8__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$9.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$9.h
new file mode 100644
index 000000000..246c7d973
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$9.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$9__
+#define __javax_swing_plaf_basic_BasicScrollPaneUI$9__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollPaneUI;
+            class BasicScrollPaneUI$9;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollPaneUI$9 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicScrollPaneUI$9(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$9__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$HSBChangeListener.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$HSBChangeListener.h
new file mode 100644
index 000000000..b4cd05593
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$HSBChangeListener.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$HSBChangeListener__
+#define __javax_swing_plaf_basic_BasicScrollPaneUI$HSBChangeListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ChangeEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollPaneUI;
+            class BasicScrollPaneUI$HSBChangeListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollPaneUI$HSBChangeListener : public ::java::lang::Object
+{
+
+public:
+  BasicScrollPaneUI$HSBChangeListener(::javax::swing::plaf::basic::BasicScrollPaneUI *);
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$HSBChangeListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$MouseWheelHandler.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$MouseWheelHandler.h
new file mode 100644
index 000000000..33a3deb5d
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$MouseWheelHandler.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$MouseWheelHandler__
+#define __javax_swing_plaf_basic_BasicScrollPaneUI$MouseWheelHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Rectangle;
+      namespace event
+      {
+          class MouseWheelEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollPaneUI;
+            class BasicScrollPaneUI$MouseWheelHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollPaneUI$MouseWheelHandler : public ::java::lang::Object
+{
+
+public: // actually protected
+  BasicScrollPaneUI$MouseWheelHandler(::javax::swing::plaf::basic::BasicScrollPaneUI *);
+public:
+  virtual void mouseWheelMoved(::java::awt::event::MouseWheelEvent *);
+public: // actually package-private
+  ::java::awt::Rectangle * __attribute__((aligned(__alignof__( ::java::lang::Object)))) rect;
+  ::javax::swing::plaf::basic::BasicScrollPaneUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$MouseWheelHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$PropertyChangeHandler.h
new file mode 100644
index 000000000..d41feb6d4
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$PropertyChangeHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$PropertyChangeHandler__
+#define __javax_swing_plaf_basic_BasicScrollPaneUI$PropertyChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollPaneUI;
+            class BasicScrollPaneUI$PropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollPaneUI$PropertyChangeHandler : public ::java::lang::Object
+{
+
+public:
+  BasicScrollPaneUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicScrollPaneUI *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$VSBChangeListener.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$VSBChangeListener.h
new file mode 100644
index 000000000..53c4f804b
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$VSBChangeListener.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$VSBChangeListener__
+#define __javax_swing_plaf_basic_BasicScrollPaneUI$VSBChangeListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ChangeEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollPaneUI;
+            class BasicScrollPaneUI$VSBChangeListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollPaneUI$VSBChangeListener : public ::java::lang::Object
+{
+
+public:
+  BasicScrollPaneUI$VSBChangeListener(::javax::swing::plaf::basic::BasicScrollPaneUI *);
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$VSBChangeListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$ViewportChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$ViewportChangeHandler.h
new file mode 100644
index 000000000..abbdc71b2
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$ViewportChangeHandler.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$ViewportChangeHandler__
+#define __javax_swing_plaf_basic_BasicScrollPaneUI$ViewportChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ChangeEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollPaneUI;
+            class BasicScrollPaneUI$ViewportChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollPaneUI$ViewportChangeHandler : public ::java::lang::Object
+{
+
+public:
+  BasicScrollPaneUI$ViewportChangeHandler(::javax::swing::plaf::basic::BasicScrollPaneUI *);
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$ViewportChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$ViewportContainerListener.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$ViewportContainerListener.h
new file mode 100644
index 000000000..d0ca2438d
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$ViewportContainerListener.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$ViewportContainerListener__
+#define __javax_swing_plaf_basic_BasicScrollPaneUI$ViewportContainerListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ContainerEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicScrollPaneUI;
+            class BasicScrollPaneUI$ViewportContainerListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollPaneUI$ViewportContainerListener : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicScrollPaneUI$ViewportContainerListener(::javax::swing::plaf::basic::BasicScrollPaneUI *);
+public:
+  virtual void componentAdded(::java::awt::event::ContainerEvent *);
+  virtual void componentRemoved(::java::awt::event::ContainerEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$ViewportContainerListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI.h
new file mode 100644
index 000000000..c06cf939f
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI.h
@@ -0,0 +1,108 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI__
+#define __javax_swing_plaf_basic_BasicScrollPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ScrollPaneUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+      namespace event
+      {
+          class ContainerListener;
+          class MouseWheelListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeEvent;
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ActionMap;
+        class InputMap;
+        class JComponent;
+        class JScrollPane;
+      namespace event
+      {
+          class ChangeListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicScrollPaneUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicScrollPaneUI : public ::javax::swing::plaf::ScrollPaneUI
+{
+
+public:
+  BasicScrollPaneUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installDefaults(::javax::swing::JScrollPane *);
+  virtual void uninstallDefaults(::javax::swing::JScrollPane *);
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installListeners(::javax::swing::JScrollPane *);
+public: // actually package-private
+  virtual ::javax::swing::InputMap * getInputMap(jint);
+  virtual ::javax::swing::ActionMap * getActionMap();
+  virtual ::javax::swing::ActionMap * createActionMap();
+public: // actually protected
+  virtual void installKeyboardActions(::javax::swing::JScrollPane *);
+  virtual void uninstallKeyboardActions(::javax::swing::JScrollPane *);
+  virtual ::javax::swing::event::ChangeListener * createHSBChangeListener();
+  virtual ::javax::swing::event::ChangeListener * createVSBChangeListener();
+  virtual ::javax::swing::event::ChangeListener * createViewportChangeListener();
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
+  virtual ::java::awt::event::MouseWheelListener * createMouseWheelListener();
+public:
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void uninstallListeners(::javax::swing::JComponent *);
+public:
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+public: // actually protected
+  virtual void syncScrollPaneWithViewport();
+  virtual void updateColumnHeader(::java::beans::PropertyChangeEvent *);
+  virtual void updateRowHeader(::java::beans::PropertyChangeEvent *);
+  virtual void updateScrollBarDisplayPolicy(::java::beans::PropertyChangeEvent *);
+  virtual void updateViewport(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  static jint SCROLL_NON_SCROLLABLES;
+  static jint ROWS_PER_WHEEL_CLICK;
+public: // actually protected
+  ::javax::swing::JScrollPane * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ScrollPaneUI)))) scrollpane;
+  ::javax::swing::event::ChangeListener * hsbChangeListener;
+  ::javax::swing::event::ChangeListener * vsbChangeListener;
+  ::javax::swing::event::ChangeListener * viewportChangeListener;
+  ::java::beans::PropertyChangeListener * spPropertyChangeListener;
+public: // actually package-private
+  ::java::awt::event::MouseWheelListener * mouseWheelListener;
+  ::java::awt::event::ContainerListener * containerListener;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicScrollPaneUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicSeparatorUI.h b/libjava/javax/swing/plaf/basic/BasicSeparatorUI.h
new file mode 100644
index 000000000..f16b625f6
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSeparatorUI.h
@@ -0,0 +1,64 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSeparatorUI__
+#define __javax_swing_plaf_basic_BasicSeparatorUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/SeparatorUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class JSeparator;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicSeparatorUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSeparatorUI : public ::javax::swing::plaf::SeparatorUI
+{
+
+public:
+  BasicSeparatorUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installDefaults(::javax::swing::JSeparator *);
+  virtual void uninstallDefaults(::javax::swing::JSeparator *);
+  virtual void installListeners(::javax::swing::JSeparator *);
+  virtual void uninstallListeners(::javax::swing::JSeparator *);
+public:
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+public: // actually protected
+  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::plaf::SeparatorUI)))) shadow;
+  ::java::awt::Color * highlight;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSeparatorUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$1.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$1.h
new file mode 100644
index 000000000..6f0c346ae
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSliderUI$1.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSliderUI$1__
+#define __javax_swing_plaf_basic_BasicSliderUI$1__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSliderUI;
+            class BasicSliderUI$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSliderUI$1 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicSliderUI$1(::javax::swing::plaf::basic::BasicSliderUI *, ::java::lang::String *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSliderUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$2.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$2.h
new file mode 100644
index 000000000..ddf707d4b
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSliderUI$2.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSliderUI$2__
+#define __javax_swing_plaf_basic_BasicSliderUI$2__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSliderUI;
+            class BasicSliderUI$2;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSliderUI$2 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicSliderUI$2(::javax::swing::plaf::basic::BasicSliderUI *, ::java::lang::String *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSliderUI$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$3.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$3.h
new file mode 100644
index 000000000..0e223c576
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSliderUI$3.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSliderUI$3__
+#define __javax_swing_plaf_basic_BasicSliderUI$3__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSliderUI;
+            class BasicSliderUI$3;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSliderUI$3 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicSliderUI$3(::javax::swing::plaf::basic::BasicSliderUI *, ::java::lang::String *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSliderUI$3__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$4.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$4.h
new file mode 100644
index 000000000..79205db34
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSliderUI$4.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSliderUI$4__
+#define __javax_swing_plaf_basic_BasicSliderUI$4__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSliderUI;
+            class BasicSliderUI$4;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSliderUI$4 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicSliderUI$4(::javax::swing::plaf::basic::BasicSliderUI *, ::java::lang::String *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSliderUI$4__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$5.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$5.h
new file mode 100644
index 000000000..824428b94
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSliderUI$5.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSliderUI$5__
+#define __javax_swing_plaf_basic_BasicSliderUI$5__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSliderUI;
+            class BasicSliderUI$5;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSliderUI$5 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicSliderUI$5(::javax::swing::plaf::basic::BasicSliderUI *, ::java::lang::String *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSliderUI$5__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$6.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$6.h
new file mode 100644
index 000000000..5e42cccd8
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSliderUI$6.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSliderUI$6__
+#define __javax_swing_plaf_basic_BasicSliderUI$6__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSliderUI;
+            class BasicSliderUI$6;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSliderUI$6 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicSliderUI$6(::javax::swing::plaf::basic::BasicSliderUI *, ::java::lang::String *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSliderUI$6__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$ActionScroller.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$ActionScroller.h
new file mode 100644
index 000000000..739b384ed
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSliderUI$ActionScroller.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSliderUI$ActionScroller__
+#define __javax_swing_plaf_basic_BasicSliderUI$ActionScroller__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JSlider;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSliderUI;
+            class BasicSliderUI$ActionScroller;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSliderUI$ActionScroller : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicSliderUI$ActionScroller(::javax::swing::plaf::basic::BasicSliderUI *, ::javax::swing::JSlider *, jint, jboolean);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSliderUI$ActionScroller__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$ChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$ChangeHandler.h
new file mode 100644
index 000000000..ee9305b54
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSliderUI$ChangeHandler.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSliderUI$ChangeHandler__
+#define __javax_swing_plaf_basic_BasicSliderUI$ChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ChangeEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSliderUI;
+            class BasicSliderUI$ChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSliderUI$ChangeHandler : public ::java::lang::Object
+{
+
+public:
+  BasicSliderUI$ChangeHandler(::javax::swing::plaf::basic::BasicSliderUI *);
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSliderUI$ChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$ComponentHandler.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$ComponentHandler.h
new file mode 100644
index 000000000..f192a5bf0
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSliderUI$ComponentHandler.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSliderUI$ComponentHandler__
+#define __javax_swing_plaf_basic_BasicSliderUI$ComponentHandler__
+
+#pragma interface
+
+#include <java/awt/event/ComponentAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ComponentEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSliderUI;
+            class BasicSliderUI$ComponentHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSliderUI$ComponentHandler : public ::java::awt::event::ComponentAdapter
+{
+
+public:
+  BasicSliderUI$ComponentHandler(::javax::swing::plaf::basic::BasicSliderUI *);
+  virtual void componentResized(::java::awt::event::ComponentEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::java::awt::event::ComponentAdapter)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSliderUI$ComponentHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$FocusHandler.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$FocusHandler.h
new file mode 100644
index 000000000..bc9102857
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSliderUI$FocusHandler.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSliderUI$FocusHandler__
+#define __javax_swing_plaf_basic_BasicSliderUI$FocusHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class FocusEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSliderUI;
+            class BasicSliderUI$FocusHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSliderUI$FocusHandler : public ::java::lang::Object
+{
+
+public:
+  BasicSliderUI$FocusHandler(::javax::swing::plaf::basic::BasicSliderUI *);
+  virtual void focusGained(::java::awt::event::FocusEvent *);
+  virtual void focusLost(::java::awt::event::FocusEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSliderUI$FocusHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$PropertyChangeHandler.h
new file mode 100644
index 000000000..b03823785
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSliderUI$PropertyChangeHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSliderUI$PropertyChangeHandler__
+#define __javax_swing_plaf_basic_BasicSliderUI$PropertyChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSliderUI;
+            class BasicSliderUI$PropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSliderUI$PropertyChangeHandler : public ::java::lang::Object
+{
+
+public:
+  BasicSliderUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicSliderUI *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSliderUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$ScrollListener.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$ScrollListener.h
new file mode 100644
index 000000000..0032d4943
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSliderUI$ScrollListener.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSliderUI$ScrollListener__
+#define __javax_swing_plaf_basic_BasicSliderUI$ScrollListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSliderUI;
+            class BasicSliderUI$ScrollListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSliderUI$ScrollListener : public ::java::lang::Object
+{
+
+public:
+  BasicSliderUI$ScrollListener(::javax::swing::plaf::basic::BasicSliderUI *);
+  BasicSliderUI$ScrollListener(::javax::swing::plaf::basic::BasicSliderUI *, jint, jboolean);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual void setDirection(jint);
+  virtual void setScrollByBlock(jboolean);
+private:
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) direction;
+  jboolean block;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSliderUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSliderUI$ScrollListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$TrackListener.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$TrackListener.h
new file mode 100644
index 000000000..1d6bda1eb
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSliderUI$TrackListener.h
@@ -0,0 +1,58 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSliderUI$TrackListener__
+#define __javax_swing_plaf_basic_BasicSliderUI$TrackListener__
+
+#pragma interface
+
+#include <javax/swing/event/MouseInputAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSliderUI;
+            class BasicSliderUI$TrackListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSliderUI$TrackListener : public ::javax::swing::event::MouseInputAdapter
+{
+
+public:
+  BasicSliderUI$TrackListener(::javax::swing::plaf::basic::BasicSliderUI *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+  virtual jboolean shouldScroll(jint);
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::javax::swing::event::MouseInputAdapter)))) currentMouseX;
+  jint currentMouseY;
+  jint offset;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSliderUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSliderUI$TrackListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI.h b/libjava/javax/swing/plaf/basic/BasicSliderUI.h
new file mode 100644
index 000000000..cb35faa26
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSliderUI.h
@@ -0,0 +1,188 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSliderUI__
+#define __javax_swing_plaf_basic_BasicSliderUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/SliderUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Dimension;
+        class Graphics;
+        class Insets;
+        class Rectangle;
+      namespace event
+      {
+          class ComponentListener;
+          class FocusListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ActionMap;
+        class InputMap;
+        class JComponent;
+        class JSlider;
+        class Timer;
+      namespace event
+      {
+          class ChangeListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicSliderUI;
+            class BasicSliderUI$ScrollListener;
+            class BasicSliderUI$TrackListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSliderUI : public ::javax::swing::plaf::SliderUI
+{
+
+public:
+  BasicSliderUI(::javax::swing::JSlider *);
+public: // actually protected
+  virtual jboolean isDragging();
+  virtual ::java::awt::Color * getShadowColor();
+  virtual ::java::awt::Color * getHighlightColor();
+  virtual ::java::awt::Color * getFocusColor();
+public:
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installDefaults(::javax::swing::JSlider *);
+  virtual ::javax::swing::plaf::basic::BasicSliderUI$TrackListener * createTrackListener(::javax::swing::JSlider *);
+  virtual ::javax::swing::event::ChangeListener * createChangeListener(::javax::swing::JSlider *);
+  virtual ::java::awt::event::ComponentListener * createComponentListener(::javax::swing::JSlider *);
+  virtual ::java::awt::event::FocusListener * createFocusListener(::javax::swing::JSlider *);
+  virtual ::javax::swing::plaf::basic::BasicSliderUI$ScrollListener * createScrollListener(::javax::swing::JSlider *);
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener(::javax::swing::JSlider *);
+  virtual void installListeners(::javax::swing::JSlider *);
+  virtual void uninstallListeners(::javax::swing::JSlider *);
+  virtual void installKeyboardActions(::javax::swing::JSlider *);
+  virtual void uninstallKeyboardActions(::javax::swing::JSlider *);
+public:
+  virtual ::java::awt::Dimension * getPreferredHorizontalSize();
+  virtual ::java::awt::Dimension * getPreferredVerticalSize();
+  virtual ::java::awt::Dimension * getMinimumHorizontalSize();
+  virtual ::java::awt::Dimension * getMinimumVerticalSize();
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void calculateGeometry();
+  virtual void calculateFocusRect();
+  virtual void calculateThumbSize();
+  virtual void calculateContentRect();
+  virtual void calculateThumbLocation();
+  virtual void calculateTrackBuffer();
+  virtual ::java::awt::Dimension * getThumbSize();
+  virtual void calculateTrackRect();
+  virtual jint getTickLength();
+  virtual void calculateTickRect();
+  virtual void calculateLabelRect();
+  virtual jint getWidthOfWidestLabel();
+  virtual jint getHeightOfTallestLabel();
+  virtual jint getWidthOfHighValueLabel();
+  virtual jint getWidthOfLowValueLabel();
+  virtual jint getHeightOfHighValueLabel();
+  virtual jint getHeightOfLowValueLabel();
+  virtual jboolean drawInverted();
+  virtual ::java::awt::Component * getLowestValueLabel();
+  virtual ::java::awt::Component * getHighestValueLabel();
+public:
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+public: // actually protected
+  virtual void recalculateIfInsetsChanged();
+  virtual void recalculateIfOrientationChanged();
+public:
+  virtual void paintFocus(::java::awt::Graphics *);
+  virtual void paintTrack(::java::awt::Graphics *);
+  virtual void paintTicks(::java::awt::Graphics *);
+public: // actually protected
+  virtual void paintMinorTickForHorizSlider(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
+  virtual void paintMajorTickForHorizSlider(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
+  virtual void paintMinorTickForVertSlider(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
+  virtual void paintMajorTickForVertSlider(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
+public:
+  virtual void paintLabels(::java::awt::Graphics *);
+public: // actually protected
+  virtual void paintHorizontalLabel(::java::awt::Graphics *, jint, ::java::awt::Component *);
+  virtual void paintVerticalLabel(::java::awt::Graphics *, jint, ::java::awt::Component *);
+public:
+  virtual void paintThumb(::java::awt::Graphics *);
+  virtual void setThumbLocation(jint, jint);
+  virtual void scrollByBlock(jint);
+  virtual void scrollByUnit(jint);
+public: // actually protected
+  virtual void scrollDueToClickInTrack(jint);
+  virtual jint xPositionForValue(jint);
+  virtual jint yPositionForValue(jint);
+public:
+  virtual jint valueForYPosition(jint);
+  virtual jint valueForXPosition(jint);
+public: // actually package-private
+  virtual jint findClosestTick(jint);
+  virtual ::javax::swing::InputMap * getInputMap(jint);
+  virtual ::javax::swing::ActionMap * getActionMap();
+  virtual ::javax::swing::ActionMap * createActionMap();
+private:
+  jboolean hitClip(::java::awt::Graphics *, ::java::awt::Rectangle *);
+public: // actually protected
+  ::javax::swing::event::ChangeListener * __attribute__((aligned(__alignof__( ::javax::swing::plaf::SliderUI)))) changeListener;
+  ::java::beans::PropertyChangeListener * propertyChangeListener;
+  ::javax::swing::plaf::basic::BasicSliderUI$ScrollListener * scrollListener;
+  ::java::awt::event::ComponentListener * componentListener;
+  ::java::awt::event::FocusListener * focusListener;
+  ::javax::swing::plaf::basic::BasicSliderUI$TrackListener * trackListener;
+  ::java::awt::Insets * focusInsets;
+  ::java::awt::Insets * insetCache;
+  ::java::awt::Rectangle * contentRect;
+  ::java::awt::Rectangle * focusRect;
+  ::java::awt::Rectangle * thumbRect;
+  ::java::awt::Rectangle * tickRect;
+  ::java::awt::Rectangle * labelRect;
+  ::java::awt::Rectangle * trackRect;
+public:
+  static const jint MAX_SCROLL = 2;
+  static const jint MIN_SCROLL = -2;
+  static const jint NEGATIVE_SCROLL = -1;
+  static const jint POSITIVE_SCROLL = 1;
+public: // actually protected
+  jint trackBuffer;
+  jboolean leftToRightCache;
+  ::javax::swing::Timer * scrollTimer;
+  ::javax::swing::JSlider * slider;
+private:
+  ::java::awt::Color * shadowColor;
+  ::java::awt::Color * highlightColor;
+  ::java::awt::Color * focusColor;
+public: // actually package-private
+  jboolean dragging;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSliderUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$1.h b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$1.h
new file mode 100644
index 000000000..f303a6e46
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$1.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSpinnerUI$1__
+#define __javax_swing_plaf_basic_BasicSpinnerUI$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSpinnerUI;
+            class BasicSpinnerUI$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSpinnerUI$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicSpinnerUI$1(::javax::swing::plaf::basic::BasicSpinnerUI *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSpinnerUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSpinnerUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$2.h b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$2.h
new file mode 100644
index 000000000..9d8f20415
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$2.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSpinnerUI$2__
+#define __javax_swing_plaf_basic_BasicSpinnerUI$2__
+
+#pragma interface
+
+#include <java/awt/event/MouseAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Timer;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSpinnerUI;
+            class BasicSpinnerUI$2;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSpinnerUI$2 : public ::java::awt::event::MouseAdapter
+{
+
+public: // actually package-private
+  BasicSpinnerUI$2(::javax::swing::plaf::basic::BasicSpinnerUI *);
+public:
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  virtual void increment();
+  jboolean volatile __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) mouseDown;
+  ::javax::swing::Timer * timer;
+  ::javax::swing::plaf::basic::BasicSpinnerUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSpinnerUI$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$3.h b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$3.h
new file mode 100644
index 000000000..84849e218
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$3.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSpinnerUI$3__
+#define __javax_swing_plaf_basic_BasicSpinnerUI$3__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSpinnerUI$2;
+            class BasicSpinnerUI$3;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSpinnerUI$3 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicSpinnerUI$3(::javax::swing::plaf::basic::BasicSpinnerUI$2 *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSpinnerUI$2 * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSpinnerUI$3__
diff --git a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$4.h b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$4.h
new file mode 100644
index 000000000..3ec6936a0
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$4.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSpinnerUI$4__
+#define __javax_swing_plaf_basic_BasicSpinnerUI$4__
+
+#pragma interface
+
+#include <java/awt/event/MouseAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Timer;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSpinnerUI;
+            class BasicSpinnerUI$4;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSpinnerUI$4 : public ::java::awt::event::MouseAdapter
+{
+
+public: // actually package-private
+  BasicSpinnerUI$4(::javax::swing::plaf::basic::BasicSpinnerUI *);
+public:
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  virtual void decrement();
+  jboolean volatile __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) mouseDown;
+  ::javax::swing::Timer * timer;
+  ::javax::swing::plaf::basic::BasicSpinnerUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSpinnerUI$4__
diff --git a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$5.h b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$5.h
new file mode 100644
index 000000000..094cc9a64
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$5.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSpinnerUI$5__
+#define __javax_swing_plaf_basic_BasicSpinnerUI$5__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSpinnerUI$4;
+            class BasicSpinnerUI$5;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSpinnerUI$5 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicSpinnerUI$5(::javax::swing::plaf::basic::BasicSpinnerUI$4 *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSpinnerUI$4 * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSpinnerUI$5__
diff --git a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$DefaultLayoutManager.h b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$DefaultLayoutManager.h
new file mode 100644
index 000000000..552ee52f5
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$DefaultLayoutManager.h
@@ -0,0 +1,62 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSpinnerUI$DefaultLayoutManager__
+#define __javax_swing_plaf_basic_BasicSpinnerUI$DefaultLayoutManager__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSpinnerUI;
+            class BasicSpinnerUI$DefaultLayoutManager;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSpinnerUI$DefaultLayoutManager : public ::java::lang::Object
+{
+
+  BasicSpinnerUI$DefaultLayoutManager(::javax::swing::plaf::basic::BasicSpinnerUI *);
+public:
+  virtual void layoutContainer(::java::awt::Container *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  virtual void removeLayoutComponent(::java::awt::Component *);
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+private:
+  ::java::awt::Dimension * prefSize(::java::awt::Component *);
+  void setBounds(::java::awt::Component *, jint, jint, jint, jint);
+public: // actually package-private
+  BasicSpinnerUI$DefaultLayoutManager(::javax::swing::plaf::basic::BasicSpinnerUI *, ::javax::swing::plaf::basic::BasicSpinnerUI$DefaultLayoutManager *);
+private:
+  ::java::awt::Component * __attribute__((aligned(__alignof__( ::java::lang::Object)))) editor;
+  ::java::awt::Component * next;
+  ::java::awt::Component * previous;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSpinnerUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSpinnerUI$DefaultLayoutManager__
diff --git a/libjava/javax/swing/plaf/basic/BasicSpinnerUI.h b/libjava/javax/swing/plaf/basic/BasicSpinnerUI.h
new file mode 100644
index 000000000..aa148b771
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSpinnerUI.h
@@ -0,0 +1,74 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSpinnerUI__
+#define __javax_swing_plaf_basic_BasicSpinnerUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/SpinnerUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class LayoutManager;
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class JSpinner;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicSpinnerUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSpinnerUI : public ::javax::swing::plaf::SpinnerUI
+{
+
+public:
+  BasicSpinnerUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::javax::swing::JComponent * createEditor();
+  virtual ::java::awt::LayoutManager * createLayout();
+  virtual ::java::awt::Component * createNextButton();
+  virtual ::java::awt::Component * createPreviousButton();
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
+  virtual void installDefaults();
+  virtual void installListeners();
+  virtual void installNextButtonListeners(::java::awt::Component *);
+  virtual void installPreviousButtonListeners(::java::awt::Component *);
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void replaceEditor(::javax::swing::JComponent *, ::javax::swing::JComponent *);
+  virtual void uninstallDefaults();
+  virtual void uninstallListeners();
+public:
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  ::javax::swing::JSpinner * __attribute__((aligned(__alignof__( ::javax::swing::plaf::SpinnerUI)))) spinner;
+private:
+  ::java::beans::PropertyChangeListener * listener;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSpinnerUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$BasicOneTouchButton.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$BasicOneTouchButton.h
new file mode 100644
index 000000000..cd5109130
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$BasicOneTouchButton.h
@@ -0,0 +1,63 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneDivider$BasicOneTouchButton__
+#define __javax_swing_plaf_basic_BasicSplitPaneDivider$BasicOneTouchButton__
+
+#pragma interface
+
+#include <javax/swing/JButton.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace border
+      {
+          class Border;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneDivider;
+            class BasicSplitPaneDivider$BasicOneTouchButton;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneDivider$BasicOneTouchButton : public ::javax::swing::JButton
+{
+
+public: // actually package-private
+  BasicSplitPaneDivider$BasicOneTouchButton(::javax::swing::plaf::basic::BasicSplitPaneDivider *, jint);
+public:
+  virtual void setBorder(::javax::swing::border::Border *);
+  virtual jboolean isFocusTraversable();
+  virtual void paint(::java::awt::Graphics *);
+public: // actually package-private
+  static const jint LEFT = 0;
+  static const jint RIGHT = 1;
+private:
+  JArray< jint > * __attribute__((aligned(__alignof__( ::javax::swing::JButton)))) xpoints;
+  JArray< jint > * ypoints;
+  jint direction;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneDivider * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneDivider$BasicOneTouchButton__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$DividerLayout.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$DividerLayout.h
new file mode 100644
index 000000000..418b6dcd8
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$DividerLayout.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneDivider$DividerLayout__
+#define __javax_swing_plaf_basic_BasicSplitPaneDivider$DividerLayout__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneDivider;
+            class BasicSplitPaneDivider$DividerLayout;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneDivider$DividerLayout : public ::java::lang::Object
+{
+
+public: // actually protected
+  BasicSplitPaneDivider$DividerLayout(::javax::swing::plaf::basic::BasicSplitPaneDivider *);
+public:
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+  virtual void layoutContainer(::java::awt::Container *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  virtual void removeLayoutComponent(::java::awt::Component *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneDivider * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneDivider$DividerLayout__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$DragController.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$DragController.h
new file mode 100644
index 000000000..902a5725c
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$DragController.h
@@ -0,0 +1,58 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneDivider$DragController__
+#define __javax_swing_plaf_basic_BasicSplitPaneDivider$DragController__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneDivider;
+            class BasicSplitPaneDivider$DragController;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneDivider$DragController : public ::java::lang::Object
+{
+
+public: // actually protected
+  BasicSplitPaneDivider$DragController(::javax::swing::plaf::basic::BasicSplitPaneDivider *, ::java::awt::event::MouseEvent *);
+  virtual jboolean isValid();
+  virtual jint positionForMouseEvent(::java::awt::event::MouseEvent *);
+  virtual jint getNeededLocation(jint, jint);
+  virtual void continueDrag(jint, jint);
+  virtual void continueDrag(::java::awt::event::MouseEvent *);
+  virtual void completeDrag(jint, jint);
+  virtual void completeDrag(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  virtual jint adjust(jint, jint);
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) offset;
+  ::javax::swing::plaf::basic::BasicSplitPaneDivider * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneDivider$DragController__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$MouseHandler.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$MouseHandler.h
new file mode 100644
index 000000000..bafbfee1b
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$MouseHandler.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneDivider$MouseHandler__
+#define __javax_swing_plaf_basic_BasicSplitPaneDivider$MouseHandler__
+
+#pragma interface
+
+#include <java/awt/event/MouseAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneDivider;
+            class BasicSplitPaneDivider$MouseHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneDivider$MouseHandler : public ::java::awt::event::MouseAdapter
+{
+
+public: // actually protected
+  BasicSplitPaneDivider$MouseHandler(::javax::swing::plaf::basic::BasicSplitPaneDivider *);
+public:
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+private:
+  jboolean __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) isDragging;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneDivider * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneDivider$MouseHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$OneTouchAction.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$OneTouchAction.h
new file mode 100644
index 000000000..bc1538536
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$OneTouchAction.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneDivider$OneTouchAction__
+#define __javax_swing_plaf_basic_BasicSplitPaneDivider$OneTouchAction__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneDivider;
+            class BasicSplitPaneDivider$OneTouchAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneDivider$OneTouchAction : public ::java::lang::Object
+{
+
+  BasicSplitPaneDivider$OneTouchAction(::javax::swing::plaf::basic::BasicSplitPaneDivider *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  BasicSplitPaneDivider$OneTouchAction(::javax::swing::plaf::basic::BasicSplitPaneDivider *, ::javax::swing::plaf::basic::BasicSplitPaneDivider$OneTouchAction *);
+  ::javax::swing::plaf::basic::BasicSplitPaneDivider * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneDivider$OneTouchAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$VerticalDragController.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$VerticalDragController.h
new file mode 100644
index 000000000..cc1a14915
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$VerticalDragController.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneDivider$VerticalDragController__
+#define __javax_swing_plaf_basic_BasicSplitPaneDivider$VerticalDragController__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicSplitPaneDivider$DragController.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneDivider;
+            class BasicSplitPaneDivider$VerticalDragController;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneDivider$VerticalDragController : public ::javax::swing::plaf::basic::BasicSplitPaneDivider$DragController
+{
+
+public: // actually protected
+  BasicSplitPaneDivider$VerticalDragController(::javax::swing::plaf::basic::BasicSplitPaneDivider *, ::java::awt::event::MouseEvent *);
+  virtual jint getNeededLocation(jint, jint);
+  virtual jint positionForMouseEvent(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  virtual jint adjust(jint, jint);
+  ::javax::swing::plaf::basic::BasicSplitPaneDivider * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicSplitPaneDivider$DragController)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneDivider$VerticalDragController__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider.h
new file mode 100644
index 000000000..a4c51fc55
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider.h
@@ -0,0 +1,97 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneDivider__
+#define __javax_swing_plaf_basic_BasicSplitPaneDivider__
+
+#pragma interface
+
+#include <java/awt/Container.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Dimension;
+        class Graphics;
+        class Insets;
+    }
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JButton;
+        class JSplitPane;
+      namespace border
+      {
+          class Border;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneDivider;
+            class BasicSplitPaneDivider$DragController;
+            class BasicSplitPaneDivider$MouseHandler;
+            class BasicSplitPaneUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneDivider : public ::java::awt::Container
+{
+
+public:
+  BasicSplitPaneDivider(::javax::swing::plaf::basic::BasicSplitPaneUI *);
+  virtual void setBasicSplitPaneUI(::javax::swing::plaf::basic::BasicSplitPaneUI *);
+  virtual ::javax::swing::plaf::basic::BasicSplitPaneUI * getBasicSplitPaneUI();
+  virtual void setDividerSize(jint);
+  virtual jint getDividerSize();
+  virtual void setBorder(::javax::swing::border::Border *);
+  virtual ::javax::swing::border::Border * getBorder();
+  virtual ::java::awt::Insets * getInsets();
+  virtual ::java::awt::Dimension * getPreferredSize();
+  virtual ::java::awt::Dimension * getMinimumSize();
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+  virtual void paint(::java::awt::Graphics *);
+public: // actually protected
+  virtual void oneTouchExpandableChanged();
+  virtual ::javax::swing::JButton * createLeftOneTouchButton();
+  virtual ::javax::swing::JButton * createRightOneTouchButton();
+  virtual void prepareForDragging();
+  virtual void dragDividerTo(jint);
+  virtual void finishDraggingTo(jint);
+public: // actually package-private
+  virtual void moveDividerTo(jint);
+  static const jlong serialVersionUID = 1463404307042803342LL;
+public: // actually protected
+  static const jint ONE_TOUCH_SIZE = 6;
+  static const jint ONE_TOUCH_OFFSET = 2;
+  ::javax::swing::plaf::basic::BasicSplitPaneDivider$DragController * __attribute__((aligned(__alignof__( ::java::awt::Container)))) dragger;
+  ::javax::swing::plaf::basic::BasicSplitPaneUI * splitPaneUI;
+  jint dividerSize;
+  ::java::awt::Component * hiddenDivider;
+  ::javax::swing::JSplitPane * splitPane;
+  ::javax::swing::plaf::basic::BasicSplitPaneDivider$MouseHandler * mouseHandler;
+  jint orientation;
+  ::javax::swing::JButton * leftButton;
+  ::javax::swing::JButton * rightButton;
+private:
+  ::javax::swing::border::Border * border;
+public: // actually package-private
+  jint currentDividerLocation;
+  jboolean centerOneTouchButtons;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneDivider__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$1.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$1.h
new file mode 100644
index 000000000..16005e6d8
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$1.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$1__
+#define __javax_swing_plaf_basic_BasicSplitPaneUI$1__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneUI;
+            class BasicSplitPaneUI$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneUI$1 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicSplitPaneUI$1(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$2.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$2.h
new file mode 100644
index 000000000..9fea0b445
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$2.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$2__
+#define __javax_swing_plaf_basic_BasicSplitPaneUI$2__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneUI;
+            class BasicSplitPaneUI$2;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneUI$2 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicSplitPaneUI$2(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$3.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$3.h
new file mode 100644
index 000000000..70833ad11
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$3.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$3__
+#define __javax_swing_plaf_basic_BasicSplitPaneUI$3__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneUI;
+            class BasicSplitPaneUI$3;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneUI$3 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicSplitPaneUI$3(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$3__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$4.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$4.h
new file mode 100644
index 000000000..a1bf35121
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$4.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$4__
+#define __javax_swing_plaf_basic_BasicSplitPaneUI$4__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneUI;
+            class BasicSplitPaneUI$4;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneUI$4 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicSplitPaneUI$4(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$4__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$5.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$5.h
new file mode 100644
index 000000000..9dc822fcb
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$5.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$5__
+#define __javax_swing_plaf_basic_BasicSplitPaneUI$5__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneUI;
+            class BasicSplitPaneUI$5;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneUI$5 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicSplitPaneUI$5(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$5__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$6.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$6.h
new file mode 100644
index 000000000..8b182f1f8
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$6.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$6__
+#define __javax_swing_plaf_basic_BasicSplitPaneUI$6__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneUI;
+            class BasicSplitPaneUI$6;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneUI$6 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicSplitPaneUI$6(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$6__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$7.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$7.h
new file mode 100644
index 000000000..517b5a0f8
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$7.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$7__
+#define __javax_swing_plaf_basic_BasicSplitPaneUI$7__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneUI;
+            class BasicSplitPaneUI$7;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneUI$7 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicSplitPaneUI$7(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$7__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$8.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$8.h
new file mode 100644
index 000000000..88213ffb1
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$8.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$8__
+#define __javax_swing_plaf_basic_BasicSplitPaneUI$8__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneUI;
+            class BasicSplitPaneUI$8;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneUI$8 : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicSplitPaneUI$8(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$8__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$BasicHorizontalLayoutManager.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$BasicHorizontalLayoutManager.h
new file mode 100644
index 000000000..7f3b3932f
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$BasicHorizontalLayoutManager.h
@@ -0,0 +1,88 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$BasicHorizontalLayoutManager__
+#define __javax_swing_plaf_basic_BasicSplitPaneUI$BasicHorizontalLayoutManager__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneUI;
+            class BasicSplitPaneUI$BasicHorizontalLayoutManager;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneUI$BasicHorizontalLayoutManager : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicSplitPaneUI$BasicHorizontalLayoutManager(::javax::swing::plaf::basic::BasicSplitPaneUI *);
+  BasicSplitPaneUI$BasicHorizontalLayoutManager(::javax::swing::plaf::basic::BasicSplitPaneUI *, jint);
+public:
+  virtual void addLayoutComponent(::java::awt::Component *, ::java::lang::Object *);
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+public: // actually protected
+  virtual jint getAvailableSize(::java::awt::Dimension *, ::java::awt::Insets *);
+  virtual jint getInitialLocation(::java::awt::Insets *);
+public:
+  virtual jfloat getLayoutAlignmentX(::java::awt::Container *);
+  virtual jfloat getLayoutAlignmentY(::java::awt::Container *);
+public: // actually protected
+  virtual jint getPreferredSizeOfComponent(::java::awt::Component *);
+  virtual jint getSizeOfComponent(::java::awt::Component *);
+  virtual JArray< jint > * getSizes();
+public:
+  virtual void invalidateLayout(::java::awt::Container *);
+  virtual void layoutContainer(::java::awt::Container *);
+  virtual ::java::awt::Dimension * maximumLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  virtual void removeLayoutComponent(::java::awt::Component *);
+public: // actually protected
+  virtual void resetSizeAt(jint);
+public:
+  virtual void resetToPreferredSizes();
+public: // actually protected
+  virtual void setComponentToSize(::java::awt::Component *, jint, jint, ::java::awt::Insets *, ::java::awt::Dimension *);
+  virtual void setSizes(JArray< jint > *);
+  virtual void updateComponents();
+public: // actually package-private
+  virtual void distributeExtraSpace();
+  virtual jint minimumSizeOfComponent(jint);
+public: // actually protected
+  JArray< ::java::awt::Component * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) components;
+  JArray< jint > * sizes;
+private:
+  jint axis;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$BasicHorizontalLayoutManager__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$BasicVerticalLayoutManager.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$BasicVerticalLayoutManager.h
new file mode 100644
index 000000000..47f78ce61
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$BasicVerticalLayoutManager.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$BasicVerticalLayoutManager__
+#define __javax_swing_plaf_basic_BasicSplitPaneUI$BasicVerticalLayoutManager__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicSplitPaneUI$BasicHorizontalLayoutManager.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneUI;
+            class BasicSplitPaneUI$BasicVerticalLayoutManager;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneUI$BasicVerticalLayoutManager : public ::javax::swing::plaf::basic::BasicSplitPaneUI$BasicHorizontalLayoutManager
+{
+
+public:
+  BasicSplitPaneUI$BasicVerticalLayoutManager(::javax::swing::plaf::basic::BasicSplitPaneUI *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicSplitPaneUI$BasicHorizontalLayoutManager)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$BasicVerticalLayoutManager__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$FocusHandler.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$FocusHandler.h
new file mode 100644
index 000000000..a338ae8cf
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$FocusHandler.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$FocusHandler__
+#define __javax_swing_plaf_basic_BasicSplitPaneUI$FocusHandler__
+
+#pragma interface
+
+#include <java/awt/event/FocusAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class FocusEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneUI;
+            class BasicSplitPaneUI$FocusHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneUI$FocusHandler : public ::java::awt::event::FocusAdapter
+{
+
+public:
+  BasicSplitPaneUI$FocusHandler(::javax::swing::plaf::basic::BasicSplitPaneUI *);
+  virtual void focusGained(::java::awt::event::FocusEvent *);
+  virtual void focusLost(::java::awt::event::FocusEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::java::awt::event::FocusAdapter)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$FocusHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardDownRightHandler.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardDownRightHandler.h
new file mode 100644
index 000000000..439de5c72
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardDownRightHandler.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardDownRightHandler__
+#define __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardDownRightHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneUI;
+            class BasicSplitPaneUI$KeyboardDownRightHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneUI$KeyboardDownRightHandler : public ::java::lang::Object
+{
+
+public:
+  BasicSplitPaneUI$KeyboardDownRightHandler(::javax::swing::plaf::basic::BasicSplitPaneUI *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardDownRightHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardEndHandler.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardEndHandler.h
new file mode 100644
index 000000000..4b474d912
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardEndHandler.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardEndHandler__
+#define __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardEndHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneUI;
+            class BasicSplitPaneUI$KeyboardEndHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneUI$KeyboardEndHandler : public ::java::lang::Object
+{
+
+public:
+  BasicSplitPaneUI$KeyboardEndHandler(::javax::swing::plaf::basic::BasicSplitPaneUI *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardEndHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardHomeHandler.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardHomeHandler.h
new file mode 100644
index 000000000..755d657f0
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardHomeHandler.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardHomeHandler__
+#define __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardHomeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneUI;
+            class BasicSplitPaneUI$KeyboardHomeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneUI$KeyboardHomeHandler : public ::java::lang::Object
+{
+
+public:
+  BasicSplitPaneUI$KeyboardHomeHandler(::javax::swing::plaf::basic::BasicSplitPaneUI *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardHomeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardResizeToggleHandler.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardResizeToggleHandler.h
new file mode 100644
index 000000000..34e9acdc2
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardResizeToggleHandler.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardResizeToggleHandler__
+#define __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardResizeToggleHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneUI;
+            class BasicSplitPaneUI$KeyboardResizeToggleHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneUI$KeyboardResizeToggleHandler : public ::java::lang::Object
+{
+
+public:
+  BasicSplitPaneUI$KeyboardResizeToggleHandler(::javax::swing::plaf::basic::BasicSplitPaneUI *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardResizeToggleHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardUpLeftHandler.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardUpLeftHandler.h
new file mode 100644
index 000000000..ce00ebc9d
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardUpLeftHandler.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardUpLeftHandler__
+#define __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardUpLeftHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneUI;
+            class BasicSplitPaneUI$KeyboardUpLeftHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneUI$KeyboardUpLeftHandler : public ::java::lang::Object
+{
+
+public:
+  BasicSplitPaneUI$KeyboardUpLeftHandler(::javax::swing::plaf::basic::BasicSplitPaneUI *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardUpLeftHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$PropertyHandler.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$PropertyHandler.h
new file mode 100644
index 000000000..87f023b5f
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$PropertyHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$PropertyHandler__
+#define __javax_swing_plaf_basic_BasicSplitPaneUI$PropertyHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicSplitPaneUI;
+            class BasicSplitPaneUI$PropertyHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneUI$PropertyHandler : public ::java::lang::Object
+{
+
+public:
+  BasicSplitPaneUI$PropertyHandler(::javax::swing::plaf::basic::BasicSplitPaneUI *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$PropertyHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI.h
new file mode 100644
index 000000000..fdbcb1519
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI.h
@@ -0,0 +1,149 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI__
+#define __javax_swing_plaf_basic_BasicSplitPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/SplitPaneUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Dimension;
+        class Graphics;
+        class Insets;
+      namespace event
+      {
+          class ActionListener;
+          class FocusListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ActionMap;
+        class InputMap;
+        class JComponent;
+        class JSplitPane;
+        class KeyStroke;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicSplitPaneDivider;
+            class BasicSplitPaneUI;
+            class BasicSplitPaneUI$BasicHorizontalLayoutManager;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicSplitPaneUI : public ::javax::swing::plaf::SplitPaneUI
+{
+
+public:
+  BasicSplitPaneUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installDefaults();
+  virtual void uninstallDefaults();
+  virtual void installListeners();
+  virtual void uninstallListeners();
+public: // actually package-private
+  virtual ::javax::swing::InputMap * getInputMap(jint);
+  virtual ::javax::swing::ActionMap * getActionMap();
+  virtual ::javax::swing::ActionMap * createActionMap();
+public: // actually protected
+  virtual void installKeyboardActions();
+  virtual void uninstallKeyboardActions();
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
+  virtual ::java::awt::event::FocusListener * createFocusListener();
+  virtual ::java::awt::event::ActionListener * createKeyboardUpLeftListener();
+  virtual ::java::awt::event::ActionListener * createKeyboardDownRightListener();
+  virtual ::java::awt::event::ActionListener * createKeyboardHomeListener();
+  virtual ::java::awt::event::ActionListener * createKeyboardEndListener();
+  virtual ::java::awt::event::ActionListener * createKeyboardResizeToggleListener();
+public:
+  virtual jint getOrientation();
+  virtual void setOrientation(jint);
+  virtual jboolean isContinuousLayout();
+  virtual void setContinuousLayout(jboolean);
+  virtual jint getLastDragLocation();
+  virtual void setLastDragLocation(jint);
+  virtual ::javax::swing::plaf::basic::BasicSplitPaneDivider * getDivider();
+public: // actually protected
+  virtual ::java::awt::Component * createDefaultNonContinuousLayoutDivider();
+  virtual void setNonContinuousLayoutDivider(::java::awt::Component *);
+  virtual void setNonContinuousLayoutDivider(::java::awt::Component *, jboolean);
+public:
+  virtual ::java::awt::Component * getNonContinuousLayoutDivider();
+  virtual ::javax::swing::JSplitPane * getSplitPane();
+  virtual ::javax::swing::plaf::basic::BasicSplitPaneDivider * createDefaultDivider();
+  virtual void resetToPreferredSizes(::javax::swing::JSplitPane *);
+  virtual void setDividerLocation(::javax::swing::JSplitPane *, jint);
+  virtual jint getDividerLocation(::javax::swing::JSplitPane *);
+  virtual jint getMinimumDividerLocation(::javax::swing::JSplitPane *);
+  virtual jint getMaximumDividerLocation(::javax::swing::JSplitPane *);
+  virtual void finishedPaintingChildren(::javax::swing::JSplitPane *, ::java::awt::Graphics *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Insets * getInsets(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void resetLayoutManager();
+  virtual void startDragging();
+  virtual void dragDividerTo(jint);
+  virtual void finishDraggingTo(jint);
+  virtual jint getDividerBorderSize();
+private:
+  jint validLocation(jint);
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::javax::swing::plaf::SplitPaneUI)))) beginDragDividerLocation;
+  jint dividerSize;
+public: // actually package-private
+  jint lastDragLocation;
+public: // actually protected
+  static jint KEYBOARD_DIVIDER_MOVE_OFFSET;
+  ::javax::swing::plaf::basic::BasicSplitPaneDivider * divider;
+  ::java::beans::PropertyChangeListener * propertyChangeListener;
+  ::java::awt::event::FocusListener * focusListener;
+  ::java::awt::event::ActionListener * keyboardDownRightListener;
+  ::java::awt::event::ActionListener * keyboardEndListener;
+  ::java::awt::event::ActionListener * keyboardHomeListener;
+  ::java::awt::event::ActionListener * keyboardResizeToggleListener;
+  ::java::awt::event::ActionListener * keyboardUpLeftListener;
+  ::javax::swing::plaf::basic::BasicSplitPaneUI$BasicHorizontalLayoutManager * layoutManager;
+  ::javax::swing::KeyStroke * dividerResizeToggleKey;
+  ::javax::swing::KeyStroke * downKey;
+  ::javax::swing::KeyStroke * endKey;
+  ::javax::swing::KeyStroke * homeKey;
+  ::javax::swing::KeyStroke * leftKey;
+  ::javax::swing::KeyStroke * rightKey;
+  ::javax::swing::KeyStroke * upKey;
+  jboolean draggingHW;
+  static ::java::lang::String * NON_CONTINUOUS_DIVIDER;
+  ::java::awt::Component * nonContinuousLayoutDivider;
+  ::javax::swing::JSplitPane * splitPane;
+public: // actually package-private
+  jboolean dividerLocationSet;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicSplitPaneUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$FocusHandler.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$FocusHandler.h
new file mode 100644
index 000000000..4545f105d
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$FocusHandler.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$FocusHandler__
+#define __javax_swing_plaf_basic_BasicTabbedPaneUI$FocusHandler__
+
+#pragma interface
+
+#include <java/awt/event/FocusAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class FocusEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTabbedPaneUI;
+            class BasicTabbedPaneUI$FocusHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTabbedPaneUI$FocusHandler : public ::java::awt::event::FocusAdapter
+{
+
+public:
+  BasicTabbedPaneUI$FocusHandler(::javax::swing::plaf::basic::BasicTabbedPaneUI *);
+  virtual void focusGained(::java::awt::event::FocusEvent *);
+  virtual void focusLost(::java::awt::event::FocusEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTabbedPaneUI * __attribute__((aligned(__alignof__( ::java::awt::event::FocusAdapter)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$FocusHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$MouseHandler.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$MouseHandler.h
new file mode 100644
index 000000000..c36fc5020
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$MouseHandler.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$MouseHandler__
+#define __javax_swing_plaf_basic_BasicTabbedPaneUI$MouseHandler__
+
+#pragma interface
+
+#include <java/awt/event/MouseAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTabbedPaneUI;
+            class BasicTabbedPaneUI$MouseHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTabbedPaneUI$MouseHandler : public ::java::awt::event::MouseAdapter
+{
+
+public:
+  BasicTabbedPaneUI$MouseHandler(::javax::swing::plaf::basic::BasicTabbedPaneUI *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseEntered(::java::awt::event::MouseEvent *);
+  virtual void mouseExited(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  virtual void redispatchEvent(::java::awt::event::MouseEvent *);
+  ::javax::swing::plaf::basic::BasicTabbedPaneUI * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$MouseHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigateAction.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigateAction.h
new file mode 100644
index 000000000..17596c232
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigateAction.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$NavigateAction__
+#define __javax_swing_plaf_basic_BasicTabbedPaneUI$NavigateAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTabbedPaneUI$NavigateAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTabbedPaneUI$NavigateAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicTabbedPaneUI$NavigateAction(::java::lang::String *, jint);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  jint __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) direction;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$NavigateAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigatePageDownAction.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigatePageDownAction.h
new file mode 100644
index 000000000..52e7e35cd
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigatePageDownAction.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$NavigatePageDownAction__
+#define __javax_swing_plaf_basic_BasicTabbedPaneUI$NavigatePageDownAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTabbedPaneUI$NavigatePageDownAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTabbedPaneUI$NavigatePageDownAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicTabbedPaneUI$NavigatePageDownAction();
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$NavigatePageDownAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigatePageUpAction.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigatePageUpAction.h
new file mode 100644
index 000000000..c5195afb5
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigatePageUpAction.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$NavigatePageUpAction__
+#define __javax_swing_plaf_basic_BasicTabbedPaneUI$NavigatePageUpAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTabbedPaneUI$NavigatePageUpAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTabbedPaneUI$NavigatePageUpAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicTabbedPaneUI$NavigatePageUpAction();
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$NavigatePageUpAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$PropertyChangeHandler.h
new file mode 100644
index 000000000..09e568fe4
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$PropertyChangeHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$PropertyChangeHandler__
+#define __javax_swing_plaf_basic_BasicTabbedPaneUI$PropertyChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTabbedPaneUI;
+            class BasicTabbedPaneUI$PropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTabbedPaneUI$PropertyChangeHandler : public ::java::lang::Object
+{
+
+public:
+  BasicTabbedPaneUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicTabbedPaneUI *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTabbedPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$RequestFocusAction.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$RequestFocusAction.h
new file mode 100644
index 000000000..1ee8f725b
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$RequestFocusAction.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$RequestFocusAction__
+#define __javax_swing_plaf_basic_BasicTabbedPaneUI$RequestFocusAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTabbedPaneUI$RequestFocusAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTabbedPaneUI$RequestFocusAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicTabbedPaneUI$RequestFocusAction();
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$RequestFocusAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$RequestFocusForVisibleComponentAction.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$RequestFocusForVisibleComponentAction.h
new file mode 100644
index 000000000..cbb776a34
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$RequestFocusForVisibleComponentAction.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$RequestFocusForVisibleComponentAction__
+#define __javax_swing_plaf_basic_BasicTabbedPaneUI$RequestFocusForVisibleComponentAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTabbedPaneUI$RequestFocusForVisibleComponentAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTabbedPaneUI$RequestFocusForVisibleComponentAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicTabbedPaneUI$RequestFocusForVisibleComponentAction();
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$RequestFocusForVisibleComponentAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingButton.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingButton.h
new file mode 100644
index 000000000..895072d42
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingButton.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingButton__
+#define __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingButton__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicArrowButton.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTabbedPaneUI;
+            class BasicTabbedPaneUI$ScrollingButton;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingButton : public ::javax::swing::plaf::basic::BasicArrowButton
+{
+
+public:
+  BasicTabbedPaneUI$ScrollingButton(::javax::swing::plaf::basic::BasicTabbedPaneUI *, jint);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTabbedPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicArrowButton)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingButton__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI.h
new file mode 100644
index 000000000..d896ca00a
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI__
+#define __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicPanelUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTabbedPaneUI$ScrollingPanel;
+            class BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI : public ::javax::swing::plaf::basic::BasicPanelUI
+{
+
+  BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI(::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingPanel *);
+public:
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+public: // actually package-private
+  BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI(::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingPanel *, ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI *);
+  ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingPanel * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicPanelUI)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingPanel.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingPanel.h
new file mode 100644
index 000000000..4c1d48344
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingPanel.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingPanel__
+#define __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingPanel__
+
+#pragma interface
+
+#include <javax/swing/JPanel.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTabbedPaneUI;
+            class BasicTabbedPaneUI$ScrollingPanel;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingPanel : public ::javax::swing::JPanel
+{
+
+  BasicTabbedPaneUI$ScrollingPanel(::javax::swing::plaf::basic::BasicTabbedPaneUI *);
+public:
+  virtual void updateUI();
+public: // actually package-private
+  BasicTabbedPaneUI$ScrollingPanel(::javax::swing::plaf::basic::BasicTabbedPaneUI *, ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingPanel *);
+  static ::javax::swing::plaf::basic::BasicTabbedPaneUI * access$1(::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingPanel *);
+  ::javax::swing::plaf::basic::BasicTabbedPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::JPanel)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingPanel__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingViewport.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingViewport.h
new file mode 100644
index 000000000..2469bbe27
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingViewport.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingViewport__
+#define __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingViewport__
+
+#pragma interface
+
+#include <javax/swing/JViewport.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTabbedPaneUI;
+            class BasicTabbedPaneUI$ScrollingViewport;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingViewport : public ::javax::swing::JViewport
+{
+
+  BasicTabbedPaneUI$ScrollingViewport(::javax::swing::plaf::basic::BasicTabbedPaneUI *);
+public: // actually package-private
+  BasicTabbedPaneUI$ScrollingViewport(::javax::swing::plaf::basic::BasicTabbedPaneUI *, ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingViewport *);
+  ::javax::swing::plaf::basic::BasicTabbedPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::JViewport)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingViewport__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabSelectionHandler.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabSelectionHandler.h
new file mode 100644
index 000000000..ad26176e0
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabSelectionHandler.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$TabSelectionHandler__
+#define __javax_swing_plaf_basic_BasicTabbedPaneUI$TabSelectionHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ChangeEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTabbedPaneUI;
+            class BasicTabbedPaneUI$TabSelectionHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTabbedPaneUI$TabSelectionHandler : public ::java::lang::Object
+{
+
+public:
+  BasicTabbedPaneUI$TabSelectionHandler(::javax::swing::plaf::basic::BasicTabbedPaneUI *);
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTabbedPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$TabSelectionHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneLayout.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneLayout.h
new file mode 100644
index 000000000..a56abd9f4
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneLayout.h
@@ -0,0 +1,68 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$TabbedPaneLayout__
+#define __javax_swing_plaf_basic_BasicTabbedPaneUI$TabbedPaneLayout__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTabbedPaneUI;
+            class BasicTabbedPaneUI$TabbedPaneLayout;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTabbedPaneUI$TabbedPaneLayout : public ::java::lang::Object
+{
+
+public:
+  BasicTabbedPaneUI$TabbedPaneLayout(::javax::swing::plaf::basic::BasicTabbedPaneUI *);
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+  virtual void calculateLayoutInfo();
+public: // actually protected
+  virtual ::java::awt::Dimension * calculateSize(jboolean);
+  virtual void calculateTabRects(jint, jint);
+public:
+  virtual void layoutContainer(::java::awt::Container *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+public: // actually protected
+  virtual void normalizeTabRuns(jint, jint, jint, jint);
+  virtual void padSelectedTab(jint, jint);
+  virtual void padTabRun(jint, jint, jint, jint);
+public:
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+public: // actually protected
+  virtual jint preferredTabAreaHeight(jint, jint);
+  virtual jint preferredTabAreaWidth(jint, jint);
+  virtual void rotateTabRuns(jint, jint);
+public:
+  virtual void removeLayoutComponent(::java::awt::Component *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTabbedPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$TabbedPaneLayout__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneScrollLayout.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneScrollLayout.h
new file mode 100644
index 000000000..87642f720
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneScrollLayout.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$TabbedPaneScrollLayout__
+#define __javax_swing_plaf_basic_BasicTabbedPaneUI$TabbedPaneScrollLayout__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneLayout.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Container;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTabbedPaneUI;
+            class BasicTabbedPaneUI$TabbedPaneScrollLayout;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTabbedPaneUI$TabbedPaneScrollLayout : public ::javax::swing::plaf::basic::BasicTabbedPaneUI$TabbedPaneLayout
+{
+
+  BasicTabbedPaneUI$TabbedPaneScrollLayout(::javax::swing::plaf::basic::BasicTabbedPaneUI *);
+public:
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+public: // actually protected
+  virtual jint preferredTabAreaHeight(jint, jint);
+  virtual jint preferredTabAreaWidth(jint, jint);
+  virtual void calculateTabRects(jint, jint);
+public:
+  virtual void layoutContainer(::java::awt::Container *);
+public: // actually package-private
+  BasicTabbedPaneUI$TabbedPaneScrollLayout(::javax::swing::plaf::basic::BasicTabbedPaneUI *, ::javax::swing::plaf::basic::BasicTabbedPaneUI$TabbedPaneScrollLayout *);
+  ::javax::swing::plaf::basic::BasicTabbedPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicTabbedPaneUI$TabbedPaneLayout)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$TabbedPaneScrollLayout__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.h
new file mode 100644
index 000000000..a20eedbb5
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.h
@@ -0,0 +1,223 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI__
+#define __javax_swing_plaf_basic_BasicTabbedPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/TabbedPaneUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Dimension;
+        class Font;
+        class FontMetrics;
+        class Graphics;
+        class Insets;
+        class LayoutManager;
+        class Point;
+        class Rectangle;
+      namespace event
+      {
+          class FocusListener;
+          class MouseListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ActionMap;
+        class Icon;
+        class JComponent;
+        class JTabbedPane;
+        class KeyStroke;
+      namespace event
+      {
+          class ChangeListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicTabbedPaneUI;
+            class BasicTabbedPaneUI$ScrollingButton;
+            class BasicTabbedPaneUI$ScrollingPanel;
+            class BasicTabbedPaneUI$ScrollingViewport;
+        }
+      }
+      namespace text
+      {
+          class View;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTabbedPaneUI : public ::javax::swing::plaf::TabbedPaneUI
+{
+
+public:
+  BasicTabbedPaneUI();
+public: // actually package-private
+  virtual ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingButton * createIncreaseButton();
+  virtual ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingButton * createDecreaseButton();
+  virtual ::java::awt::Point * findPointForIndex(jint);
+  virtual void scrollTab(jint, jint);
+  virtual void updateButtons();
+  virtual void updateViewPosition();
+public:
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::awt::LayoutManager * createLayoutManager();
+  virtual void installComponents();
+  virtual void uninstallComponents();
+  virtual void installDefaults();
+  virtual void uninstallDefaults();
+  virtual void installListeners();
+  virtual void uninstallListeners();
+  virtual ::java::awt::event::MouseListener * createMouseListener();
+  virtual ::java::awt::event::FocusListener * createFocusListener();
+  virtual ::javax::swing::event::ChangeListener * createChangeListener();
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
+  virtual void installKeyboardActions();
+  virtual void uninstallKeyboardActions();
+public:
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+public: // actually protected
+  virtual void paintTabArea(::java::awt::Graphics *, jint, jint);
+  virtual void paintTab(::java::awt::Graphics *, jint, JArray< ::java::awt::Rectangle * > *, jint, ::java::awt::Rectangle *, ::java::awt::Rectangle *);
+  virtual void layoutLabel(jint, ::java::awt::FontMetrics *, jint, ::java::lang::String *, ::javax::swing::Icon *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, jboolean);
+  virtual void paintIcon(::java::awt::Graphics *, jint, jint, ::javax::swing::Icon *, ::java::awt::Rectangle *, jboolean);
+  virtual void paintText(::java::awt::Graphics *, jint, ::java::awt::Font *, ::java::awt::FontMetrics *, jint, ::java::lang::String *, ::java::awt::Rectangle *, jboolean);
+  virtual jint getTabLabelShiftX(jint, jint, jboolean);
+  virtual jint getTabLabelShiftY(jint, jint, jboolean);
+  virtual void paintFocusIndicator(::java::awt::Graphics *, jint, JArray< ::java::awt::Rectangle * > *, jint, ::java::awt::Rectangle *, ::java::awt::Rectangle *, jboolean);
+  virtual void paintTabBorder(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint, jboolean);
+  virtual void paintTabBackground(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint, jboolean);
+  virtual void paintContentBorder(::java::awt::Graphics *, jint, jint);
+  virtual void paintContentBorderTopEdge(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint);
+  virtual void paintContentBorderLeftEdge(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint);
+  virtual void paintContentBorderBottomEdge(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint);
+  virtual void paintContentBorderRightEdge(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint);
+public:
+  virtual ::java::awt::Rectangle * getTabBounds(::javax::swing::JTabbedPane *, jint);
+  virtual jint getTabRunCount(::javax::swing::JTabbedPane *);
+  virtual jint tabForCoordinate(::javax::swing::JTabbedPane *, jint, jint);
+public: // actually protected
+  virtual ::java::awt::Rectangle * getTabBounds(jint, ::java::awt::Rectangle *);
+  virtual ::java::awt::Component * getVisibleComponent();
+  virtual void setVisibleComponent(::java::awt::Component *);
+  virtual void assureRectsCreated(jint);
+  virtual void expandTabRunsArray();
+  virtual jint getRunForTab(jint, jint);
+  virtual jint lastTabInRun(jint, jint);
+  virtual jint getTabRunOverlay(jint);
+  virtual jint getTabRunIndent(jint, jint);
+  virtual jboolean shouldPadTabRun(jint, jint);
+  virtual jboolean shouldRotateTabRuns(jint);
+  virtual ::javax::swing::Icon * getIconForTab(jint);
+  virtual ::javax::swing::text::View * getTextViewForTab(jint);
+  virtual jint calculateTabHeight(jint, jint, jint);
+  virtual jint calculateMaxTabHeight(jint);
+  virtual jint calculateTabWidth(jint, jint, ::java::awt::FontMetrics *);
+  virtual jint calculateMaxTabWidth(jint);
+  virtual jint calculateTabAreaHeight(jint, jint, jint);
+  virtual jint calculateTabAreaWidth(jint, jint, jint);
+  virtual ::java::awt::Insets * getTabInsets(jint, jint);
+  virtual ::java::awt::Insets * getSelectedTabPadInsets(jint);
+  virtual ::java::awt::Insets * getTabAreaInsets(jint);
+  virtual ::java::awt::Insets * getContentBorderInsets(jint);
+  virtual ::java::awt::FontMetrics * getFontMetrics();
+  virtual void navigateSelectedTab(jint);
+  virtual void selectNextTabInRun(jint);
+  virtual void selectPreviousTabInRun(jint);
+  virtual void selectNextTab(jint);
+  virtual void selectPreviousTab(jint);
+  virtual void selectAdjacentRunTab(jint, jint, jint);
+  virtual jint getTabRunOffset(jint, jint, jint, jboolean);
+  virtual jint getPreviousTabIndex(jint);
+  virtual jint getNextTabIndex(jint);
+  virtual jint getNextTabIndexInRun(jint, jint);
+  virtual jint getPreviousTabIndexInRun(jint, jint);
+  virtual jint getPreviousTabRun(jint);
+  virtual jint getNextTabRun(jint);
+  static void rotateInsets(::java::awt::Insets *, ::java::awt::Insets *, jint);
+public: // actually package-private
+  virtual ::javax::swing::ActionMap * getActionMap();
+  virtual ::javax::swing::ActionMap * createActionMap();
+public: // actually protected
+  virtual void setRolloverTab(jint);
+  virtual jint getRolloverTab();
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingButton * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TabbedPaneUI)))) incrButton;
+  ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingButton * decrButton;
+  ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingViewport * viewport;
+  ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingPanel * panel;
+  jint currentScrollLocation;
+  jint currentScrollOffset;
+public: // actually protected
+  ::java::awt::Rectangle * calcRect;
+  JArray< ::java::awt::Rectangle * > * rects;
+  ::java::awt::Insets * contentBorderInsets;
+  ::java::awt::Insets * selectedTabPadInsets;
+  ::java::awt::Insets * tabAreaInsets;
+  ::java::awt::Insets * tabInsets;
+  ::java::awt::Color * darkShadow;
+  ::java::awt::Color * focus;
+  ::java::awt::Color * highlight;
+  ::java::awt::Color * lightHighlight;
+  ::java::awt::Color * shadow;
+  jint maxTabHeight;
+  jint maxTabWidth;
+  jint runCount;
+  jint selectedRun;
+  jint tabRunOverlay;
+  jint textIconGap;
+  JArray< jint > * tabRuns;
+public: // actually package-private
+  jboolean tabRunsDirty;
+public: // actually protected
+  ::javax::swing::KeyStroke * downKey;
+  ::javax::swing::KeyStroke * leftKey;
+  ::javax::swing::KeyStroke * rightKey;
+  ::javax::swing::KeyStroke * upKey;
+  ::java::awt::event::FocusListener * focusListener;
+  ::java::awt::event::MouseListener * mouseListener;
+  ::java::beans::PropertyChangeListener * propertyChangeListener;
+  ::javax::swing::event::ChangeListener * tabChangeListener;
+  ::javax::swing::JTabbedPane * tabPane;
+public: // actually package-private
+  ::java::awt::LayoutManager * layoutManager;
+  ::java::awt::Rectangle * tabAreaRect;
+  ::java::awt::Rectangle * contentRect;
+private:
+  jint rolloverTab;
+  jboolean tabsOpaque;
+  ::java::awt::Component * visibleComponent;
+  ::java::awt::Color * selectedColor;
+  ::java::awt::Rectangle * tempTextRect;
+  ::java::awt::Rectangle * tempIconRect;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicTableHeaderUI$1.h b/libjava/javax/swing/plaf/basic/BasicTableHeaderUI$1.h
new file mode 100644
index 000000000..1e2347561
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTableHeaderUI$1.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTableHeaderUI$1__
+#define __javax_swing_plaf_basic_BasicTableHeaderUI$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTableHeaderUI$1;
+            class BasicTableHeaderUI$MouseInputHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTableHeaderUI$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicTableHeaderUI$1(::javax::swing::plaf::basic::BasicTableHeaderUI$MouseInputHandler *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTableHeaderUI$MouseInputHandler * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTableHeaderUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicTableHeaderUI$MouseInputHandler.h b/libjava/javax/swing/plaf/basic/BasicTableHeaderUI$MouseInputHandler.h
new file mode 100644
index 000000000..379f3ac29
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTableHeaderUI$MouseInputHandler.h
@@ -0,0 +1,65 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTableHeaderUI$MouseInputHandler__
+#define __javax_swing_plaf_basic_BasicTableHeaderUI$MouseInputHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Timer;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTableHeaderUI;
+            class BasicTableHeaderUI$MouseInputHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTableHeaderUI$MouseInputHandler : public ::java::lang::Object
+{
+
+public:
+  BasicTableHeaderUI$MouseInputHandler(::javax::swing::plaf::basic::BasicTableHeaderUI *);
+  virtual void mouseClicked(::java::awt::event::MouseEvent *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+  virtual void mouseEntered(::java::awt::event::MouseEvent *);
+  virtual void mouseExited(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  virtual void endResizing();
+  virtual void endDragging(::java::awt::event::MouseEvent *);
+  static ::javax::swing::plaf::basic::BasicTableHeaderUI * access$0(::javax::swing::plaf::basic::BasicTableHeaderUI$MouseInputHandler *);
+  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) showingResizeCursor;
+  jint draggingFrom;
+  jint draggingColumnNumber;
+  jint prevPrefWidth;
+  ::javax::swing::Timer * timer;
+  ::javax::swing::plaf::basic::BasicTableHeaderUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTableHeaderUI$MouseInputHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTableHeaderUI.h b/libjava/javax/swing/plaf/basic/BasicTableHeaderUI.h
new file mode 100644
index 000000000..4a31c132e
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTableHeaderUI.h
@@ -0,0 +1,92 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTableHeaderUI__
+#define __javax_swing_plaf_basic_BasicTableHeaderUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/TableHeaderUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Cursor;
+        class Dimension;
+        class Graphics;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class CellRendererPane;
+        class JComponent;
+      namespace border
+      {
+          class Border;
+      }
+      namespace event
+      {
+          class MouseInputListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicTableHeaderUI;
+        }
+      }
+      namespace table
+      {
+          class JTableHeader;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTableHeaderUI : public ::javax::swing::plaf::TableHeaderUI
+{
+
+public:
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::javax::swing::event::MouseInputListener * createMouseInputListener();
+public:
+  BasicTableHeaderUI();
+public: // actually protected
+  virtual void installDefaults();
+  virtual void installKeyboardActions();
+  virtual void installListeners();
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void uninstallDefaults();
+  virtual void uninstallKeyboardActions();
+  virtual void uninstallListeners();
+public:
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+public: // actually package-private
+  static void access$0(::javax::swing::plaf::basic::BasicTableHeaderUI *, ::java::awt::Cursor *);
+  static ::java::awt::Cursor * access$1(::javax::swing::plaf::basic::BasicTableHeaderUI *);
+  static jint COLUMN_BOUNDARY_TOLERANCE;
+public: // actually protected
+  ::javax::swing::table::JTableHeader * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TableHeaderUI)))) header;
+  ::javax::swing::event::MouseInputListener * mouseInputListener;
+  ::javax::swing::CellRendererPane * rendererPane;
+private:
+  ::javax::swing::border::Border * cellBorder;
+  ::java::awt::Cursor * originalCursor;
+public: // actually package-private
+  ::java::awt::Rectangle * draggingHeaderRect;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTableHeaderUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicTableUI$FocusHandler.h b/libjava/javax/swing/plaf/basic/BasicTableUI$FocusHandler.h
new file mode 100644
index 000000000..e7ff31e5d
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTableUI$FocusHandler.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTableUI$FocusHandler__
+#define __javax_swing_plaf_basic_BasicTableUI$FocusHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class FocusEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTableUI;
+            class BasicTableUI$FocusHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTableUI$FocusHandler : public ::java::lang::Object
+{
+
+public:
+  BasicTableUI$FocusHandler(::javax::swing::plaf::basic::BasicTableUI *);
+  virtual void focusGained(::java::awt::event::FocusEvent *);
+  virtual void focusLost(::java::awt::event::FocusEvent *);
+private:
+  void repaintLeadCell();
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTableUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTableUI$FocusHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTableUI$KeyHandler.h b/libjava/javax/swing/plaf/basic/BasicTableUI$KeyHandler.h
new file mode 100644
index 000000000..f70e6d3c8
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTableUI$KeyHandler.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTableUI$KeyHandler__
+#define __javax_swing_plaf_basic_BasicTableUI$KeyHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class KeyEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTableUI;
+            class BasicTableUI$KeyHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTableUI$KeyHandler : public ::java::lang::Object
+{
+
+public:
+  BasicTableUI$KeyHandler(::javax::swing::plaf::basic::BasicTableUI *);
+  virtual void keyTyped(::java::awt::event::KeyEvent *);
+  virtual void keyPressed(::java::awt::event::KeyEvent *);
+  virtual void keyReleased(::java::awt::event::KeyEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTableUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTableUI$KeyHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTableUI$MouseInputHandler.h b/libjava/javax/swing/plaf/basic/BasicTableUI$MouseInputHandler.h
new file mode 100644
index 000000000..a0fb583af
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTableUI$MouseInputHandler.h
@@ -0,0 +1,62 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTableUI$MouseInputHandler__
+#define __javax_swing_plaf_basic_BasicTableUI$MouseInputHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Point;
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTableUI;
+            class BasicTableUI$MouseInputHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTableUI$MouseInputHandler : public ::java::lang::Object
+{
+
+public:
+  BasicTableUI$MouseInputHandler(::javax::swing::plaf::basic::BasicTableUI *);
+private:
+  void updateSelection(jboolean);
+public:
+  virtual void mouseClicked(::java::awt::event::MouseEvent *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+  virtual void mouseEntered(::java::awt::event::MouseEvent *);
+  virtual void mouseExited(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  ::java::awt::Point * __attribute__((aligned(__alignof__( ::java::lang::Object)))) begin;
+  ::java::awt::Point * curr;
+  ::javax::swing::plaf::basic::BasicTableUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTableUI$MouseInputHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTableUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicTableUI$PropertyChangeHandler.h
new file mode 100644
index 000000000..e51aad5c0
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTableUI$PropertyChangeHandler.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTableUI$PropertyChangeHandler__
+#define __javax_swing_plaf_basic_BasicTableUI$PropertyChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTableUI;
+            class BasicTableUI$PropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTableUI$PropertyChangeHandler : public ::java::lang::Object
+{
+
+  BasicTableUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicTableUI *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  BasicTableUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicTableUI *, ::javax::swing::plaf::basic::BasicTableUI$PropertyChangeHandler *);
+  ::javax::swing::plaf::basic::BasicTableUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTableUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTableUI$TableAction.h b/libjava/javax/swing/plaf/basic/BasicTableUI$TableAction.h
new file mode 100644
index 000000000..44a245c51
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTableUI$TableAction.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTableUI$TableAction__
+#define __javax_swing_plaf_basic_BasicTableUI$TableAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JTable;
+        class ListSelectionModel;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTableUI$TableAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTableUI$TableAction : public ::javax::swing::AbstractAction
+{
+
+  BasicTableUI$TableAction();
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  virtual jint getFirstVisibleColumnIndex(::javax::swing::JTable *);
+  virtual jint getLastVisibleColumnIndex(::javax::swing::JTable *);
+  virtual jint getFirstVisibleRowIndex(::javax::swing::JTable *);
+  virtual jint getLastVisibleRowIndex(::javax::swing::JTable *);
+  virtual void advanceMultipleSelection(::javax::swing::JTable *, ::javax::swing::ListSelectionModel *, jint, jint, ::javax::swing::ListSelectionModel *, jint, jint, jboolean, jboolean);
+  virtual void advanceSingleSelection(::javax::swing::ListSelectionModel *, jint, ::javax::swing::ListSelectionModel *, jint, jboolean);
+  BasicTableUI$TableAction(::javax::swing::plaf::basic::BasicTableUI$TableAction *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTableUI$TableAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTableUI.h b/libjava/javax/swing/plaf/basic/BasicTableUI.h
new file mode 100644
index 000000000..6abd88fcb
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTableUI.h
@@ -0,0 +1,112 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTableUI__
+#define __javax_swing_plaf_basic_BasicTableUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/TableUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+        class Rectangle;
+      namespace event
+      {
+          class FocusListener;
+          class KeyListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ActionMap;
+        class CellRendererPane;
+        class JComponent;
+        class JTable;
+      namespace border
+      {
+          class Border;
+      }
+      namespace event
+      {
+          class MouseInputListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicTableUI;
+            class BasicTableUI$TableAction;
+        }
+      }
+      namespace table
+      {
+          class TableCellRenderer;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTableUI : public ::javax::swing::plaf::TableUI
+{
+
+public:
+  BasicTableUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::awt::event::FocusListener * createFocusListener();
+  virtual ::javax::swing::event::MouseInputListener * createMouseInputListener();
+  virtual ::java::awt::event::KeyListener * createKeyListener();
+public:
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+private:
+  jint getHeight();
+public: // actually protected
+  virtual void installDefaults();
+  virtual void installKeyboardActions();
+private:
+  ::javax::swing::ActionMap * getActionMap();
+  ::javax::swing::ActionMap * createDefaultActions();
+public: // actually protected
+  virtual void installListeners();
+  virtual void uninstallDefaults();
+  virtual void uninstallKeyboardActions();
+  virtual void uninstallListeners();
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually package-private
+  virtual void paintCell(::java::awt::Graphics *, jint, jint, ::java::awt::Rectangle *, ::javax::swing::table::TableCellRenderer *);
+public:
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+public: // actually protected
+  ::java::awt::event::FocusListener * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TableUI)))) focusListener;
+  ::java::awt::event::KeyListener * keyListener;
+  ::javax::swing::event::MouseInputListener * mouseInputListener;
+  ::javax::swing::CellRendererPane * rendererPane;
+  ::javax::swing::JTable * table;
+public: // actually package-private
+  ::javax::swing::border::Border * cellBorder;
+  ::javax::swing::plaf::basic::BasicTableUI$TableAction * action;
+private:
+  ::java::beans::PropertyChangeListener * propertyChangeListener;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTableUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextAreaUI.h b/libjava/javax/swing/plaf/basic/BasicTextAreaUI.h
new file mode 100644
index 000000000..c05b92a0c
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTextAreaUI.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTextAreaUI__
+#define __javax_swing_plaf_basic_BasicTextAreaUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicTextUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicTextAreaUI;
+        }
+      }
+      namespace text
+      {
+          class Element;
+          class View;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTextAreaUI : public ::javax::swing::plaf::basic::BasicTextUI
+{
+
+public:
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  BasicTextAreaUI();
+  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *);
+public: // actually protected
+  virtual ::java::lang::String * getPropertyPrefix();
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTextAreaUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextFieldUI.h b/libjava/javax/swing/plaf/basic/BasicTextFieldUI.h
new file mode 100644
index 000000000..be9a77ca0
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTextFieldUI.h
@@ -0,0 +1,58 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTextFieldUI__
+#define __javax_swing_plaf_basic_BasicTextFieldUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicTextUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicTextFieldUI;
+        }
+      }
+      namespace text
+      {
+          class Element;
+          class View;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTextFieldUI : public ::javax::swing::plaf::basic::BasicTextUI
+{
+
+public:
+  BasicTextFieldUI();
+  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *);
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::lang::String * getPropertyPrefix();
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTextFieldUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextPaneUI.h b/libjava/javax/swing/plaf/basic/BasicTextPaneUI.h
new file mode 100644
index 000000000..62d9deb3f
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTextPaneUI.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTextPaneUI__
+#define __javax_swing_plaf_basic_BasicTextPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicEditorPaneUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicTextPaneUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTextPaneUI : public ::javax::swing::plaf::basic::BasicEditorPaneUI
+{
+
+public:
+  BasicTextPaneUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::lang::String * getPropertyPrefix();
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTextPaneUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI$BasicCaret.h b/libjava/javax/swing/plaf/basic/BasicTextUI$BasicCaret.h
new file mode 100644
index 000000000..c89238e10
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTextUI$BasicCaret.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTextUI$BasicCaret__
+#define __javax_swing_plaf_basic_BasicTextUI$BasicCaret__
+
+#pragma interface
+
+#include <javax/swing/text/DefaultCaret.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTextUI$BasicCaret;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTextUI$BasicCaret : public ::javax::swing::text::DefaultCaret
+{
+
+public:
+  BasicTextUI$BasicCaret();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTextUI$BasicCaret__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI$BasicHighlighter.h b/libjava/javax/swing/plaf/basic/BasicTextUI$BasicHighlighter.h
new file mode 100644
index 000000000..657f780f9
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTextUI$BasicHighlighter.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTextUI$BasicHighlighter__
+#define __javax_swing_plaf_basic_BasicTextUI$BasicHighlighter__
+
+#pragma interface
+
+#include <javax/swing/text/DefaultHighlighter.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTextUI$BasicHighlighter;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTextUI$BasicHighlighter : public ::javax::swing::text::DefaultHighlighter
+{
+
+public:
+  BasicTextUI$BasicHighlighter();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTextUI$BasicHighlighter__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI$FocusHandler.h b/libjava/javax/swing/plaf/basic/BasicTextUI$FocusHandler.h
new file mode 100644
index 000000000..05267889e
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTextUI$FocusHandler.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTextUI$FocusHandler__
+#define __javax_swing_plaf_basic_BasicTextUI$FocusHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class FocusEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTextUI$FocusHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTextUI$FocusHandler : public ::java::lang::Object
+{
+
+  BasicTextUI$FocusHandler();
+public:
+  virtual void focusGained(::java::awt::event::FocusEvent *);
+  virtual void focusLost(::java::awt::event::FocusEvent *);
+public: // actually package-private
+  BasicTextUI$FocusHandler(::javax::swing::plaf::basic::BasicTextUI$FocusHandler *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTextUI$FocusHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI$Handler.h b/libjava/javax/swing/plaf/basic/BasicTextUI$Handler.h
new file mode 100644
index 000000000..a8ca57be7
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTextUI$Handler.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTextUI$Handler__
+#define __javax_swing_plaf_basic_BasicTextUI$Handler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class DocumentEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTextUI;
+            class BasicTextUI$Handler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTextUI$Handler : public ::java::lang::Object
+{
+
+  BasicTextUI$Handler(::javax::swing::plaf::basic::BasicTextUI *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+  virtual void changedUpdate(::javax::swing::event::DocumentEvent *);
+  virtual void insertUpdate(::javax::swing::event::DocumentEvent *);
+  virtual void removeUpdate(::javax::swing::event::DocumentEvent *);
+public: // actually package-private
+  BasicTextUI$Handler(::javax::swing::plaf::basic::BasicTextUI *, ::javax::swing::plaf::basic::BasicTextUI$Handler *);
+  ::javax::swing::plaf::basic::BasicTextUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTextUI$Handler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI$RootView.h b/libjava/javax/swing/plaf/basic/BasicTextUI$RootView.h
new file mode 100644
index 000000000..33044598a
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTextUI$RootView.h
@@ -0,0 +1,85 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTextUI$RootView__
+#define __javax_swing_plaf_basic_BasicTextUI$RootView__
+
+#pragma interface
+
+#include <javax/swing/text/View.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Container;
+        class Graphics;
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class DocumentEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTextUI;
+            class BasicTextUI$RootView;
+        }
+      }
+      namespace text
+      {
+          class AttributeSet;
+          class Document;
+          class Position$Bias;
+          class View;
+          class ViewFactory;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTextUI$RootView : public ::javax::swing::text::View
+{
+
+public:
+  BasicTextUI$RootView(::javax::swing::plaf::basic::BasicTextUI *);
+  virtual ::javax::swing::text::ViewFactory * getViewFactory();
+  virtual void preferenceChanged(::javax::swing::text::View *, jboolean, jboolean);
+  virtual void setView(::javax::swing::text::View *);
+  virtual ::javax::swing::text::View * getView(jint);
+  virtual jint getViewCount();
+  virtual ::java::awt::Container * getContainer();
+  virtual void setSize(jfloat, jfloat);
+  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
+  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
+  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
+  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual jint getNextVisualPositionFrom(jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
+  virtual jint getStartOffset();
+  virtual jint getEndOffset();
+  virtual ::javax::swing::text::Document * getDocument();
+  virtual ::javax::swing::text::AttributeSet * getAttributes();
+  virtual jfloat getPreferredSpan(jint);
+  virtual jfloat getMinimumSpan(jint);
+  virtual jfloat getMaximumSpan(jint);
+private:
+  ::javax::swing::text::View * __attribute__((aligned(__alignof__( ::javax::swing::text::View)))) view;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTextUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTextUI$RootView__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI.h b/libjava/javax/swing/plaf/basic/BasicTextUI.h
new file mode 100644
index 000000000..f96f13323
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTextUI.h
@@ -0,0 +1,137 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTextUI__
+#define __javax_swing_plaf_basic_BasicTextUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/TextUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+        class Insets;
+        class Point;
+        class Rectangle;
+      namespace event
+      {
+          class FocusListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ActionMap;
+        class InputMap;
+        class JComponent;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTextUI;
+            class BasicTextUI$Handler;
+            class BasicTextUI$RootView;
+        }
+      }
+      namespace text
+      {
+          class Caret;
+          class EditorKit;
+          class Element;
+          class Highlighter;
+          class JTextComponent;
+          class Keymap;
+          class Position$Bias;
+          class View;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTextUI : public ::javax::swing::plaf::TextUI
+{
+
+public:
+  BasicTextUI();
+public: // actually protected
+  virtual ::javax::swing::text::Caret * createCaret();
+  virtual ::javax::swing::text::Highlighter * createHighlighter();
+  virtual ::javax::swing::text::JTextComponent * getComponent();
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installDefaults();
+private:
+  void installFixedDefaults();
+public: // actually protected
+  virtual void installListeners();
+  virtual ::java::lang::String * getKeymapName();
+  virtual ::javax::swing::text::Keymap * createKeymap();
+  virtual void installKeyboardActions();
+private:
+  ::javax::swing::ActionMap * getActionMap();
+  ::javax::swing::ActionMap * createActionMap();
+  ::javax::swing::InputMap * getInputMap();
+public:
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void uninstallDefaults();
+private:
+  void uninstallFixedDefaults();
+public: // actually protected
+  virtual void uninstallListeners();
+  virtual void uninstallKeyboardActions();
+  virtual ::java::lang::String * getPropertyPrefix() = 0;
+public:
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+public: // actually protected
+  virtual void paintSafely(::java::awt::Graphics *);
+  virtual void paintBackground(::java::awt::Graphics *);
+public:
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void damageRange(::javax::swing::text::JTextComponent *, jint, jint);
+  virtual void damageRange(::javax::swing::text::JTextComponent *, jint, jint, ::javax::swing::text::Position$Bias *, ::javax::swing::text::Position$Bias *);
+  virtual ::javax::swing::text::EditorKit * getEditorKit(::javax::swing::text::JTextComponent *);
+  virtual jint getNextVisualPositionFrom(::javax::swing::text::JTextComponent *, jint, ::javax::swing::text::Position$Bias *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
+  virtual ::javax::swing::text::View * getRootView(::javax::swing::text::JTextComponent *);
+  virtual ::java::awt::Rectangle * modelToView(::javax::swing::text::JTextComponent *, jint);
+  virtual ::java::awt::Rectangle * modelToView(::javax::swing::text::JTextComponent *, jint, ::javax::swing::text::Position$Bias *);
+  virtual jint viewToModel(::javax::swing::text::JTextComponent *, ::java::awt::Point *);
+  virtual jint viewToModel(::javax::swing::text::JTextComponent *, ::java::awt::Point *, JArray< ::javax::swing::text::Position$Bias * > *);
+  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *);
+  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *, jint, jint);
+public: // actually protected
+  virtual ::java::awt::Rectangle * getVisibleEditorRect();
+  virtual void setView(::javax::swing::text::View *);
+  virtual void modelChanged();
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+private:
+  static ::java::awt::event::FocusListener * focusListener;
+  static ::javax::swing::text::EditorKit * kit;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTextUI$Handler * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TextUI)))) handler;
+  ::javax::swing::plaf::basic::BasicTextUI$RootView * rootView;
+  ::javax::swing::text::JTextComponent * textComponent;
+private:
+  ::java::awt::Insets * cachedInsets;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTextUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicToggleButtonUI.h b/libjava/javax/swing/plaf/basic/BasicToggleButtonUI.h
new file mode 100644
index 000000000..45a77348c
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicToggleButtonUI.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicToggleButtonUI__
+#define __javax_swing_plaf_basic_BasicToggleButtonUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicButtonUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class AbstractButton;
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicToggleButtonUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicToggleButtonUI : public ::javax::swing::plaf::basic::BasicButtonUI
+{
+
+public:
+  BasicToggleButtonUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::lang::String * getPropertyPrefix();
+public:
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+public: // actually protected
+  virtual void paintIcon(::java::awt::Graphics *, ::javax::swing::AbstractButton *, ::java::awt::Rectangle *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicToggleButtonUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarSeparatorUI.h b/libjava/javax/swing/plaf/basic/BasicToolBarSeparatorUI.h
new file mode 100644
index 000000000..a277f3293
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicToolBarSeparatorUI.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicToolBarSeparatorUI__
+#define __javax_swing_plaf_basic_BasicToolBarSeparatorUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicSeparatorUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class JSeparator;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicToolBarSeparatorUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicToolBarSeparatorUI : public ::javax::swing::plaf::basic::BasicSeparatorUI
+{
+
+public:
+  BasicToolBarSeparatorUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installDefaults(::javax::swing::JSeparator *);
+public:
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+private:
+  ::java::awt::Dimension * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicSeparatorUI)))) size;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicToolBarSeparatorUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI$DockingListener.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI$DockingListener.h
new file mode 100644
index 000000000..36511145a
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicToolBarUI$DockingListener.h
@@ -0,0 +1,62 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicToolBarUI$DockingListener__
+#define __javax_swing_plaf_basic_BasicToolBarUI$DockingListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Point;
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JToolBar;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicToolBarUI;
+            class BasicToolBarUI$DockingListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicToolBarUI$DockingListener : public ::java::lang::Object
+{
+
+public:
+  BasicToolBarUI$DockingListener(::javax::swing::plaf::basic::BasicToolBarUI *, ::javax::swing::JToolBar *);
+  virtual void mouseClicked(::java::awt::event::MouseEvent *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+  virtual void mouseEntered(::java::awt::event::MouseEvent *);
+  virtual void mouseExited(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+public: // actually protected
+  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) isDragging;
+  ::java::awt::Point * origin;
+  ::javax::swing::JToolBar * toolBar;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicToolBarUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicToolBarUI$DockingListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI$DragWindow.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI$DragWindow.h
new file mode 100644
index 000000000..0545be03f
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicToolBarUI$DragWindow.h
@@ -0,0 +1,60 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicToolBarUI$DragWindow__
+#define __javax_swing_plaf_basic_BasicToolBarUI$DragWindow__
+
+#pragma interface
+
+#include <java/awt/Window.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Graphics;
+        class Insets;
+        class Point;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicToolBarUI;
+            class BasicToolBarUI$DragWindow;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicToolBarUI$DragWindow : public ::java::awt::Window
+{
+
+public: // actually package-private
+  BasicToolBarUI$DragWindow(::javax::swing::plaf::basic::BasicToolBarUI *);
+public:
+  virtual ::java::awt::Color * getBorderColor();
+  virtual ::java::awt::Insets * getInsets();
+  virtual ::java::awt::Point * getOffset();
+  virtual void paint(::java::awt::Graphics *);
+  virtual void setBorderColor(::java::awt::Color *);
+  virtual void setOffset(::java::awt::Point *);
+  virtual void setOrientation(jint);
+private:
+  ::java::awt::Color * __attribute__((aligned(__alignof__( ::java::awt::Window)))) borderColor;
+  ::java::awt::Point * offset;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicToolBarUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicToolBarUI$DragWindow__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI$FrameListener.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI$FrameListener.h
new file mode 100644
index 000000000..6041d7403
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicToolBarUI$FrameListener.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicToolBarUI$FrameListener__
+#define __javax_swing_plaf_basic_BasicToolBarUI$FrameListener__
+
+#pragma interface
+
+#include <java/awt/event/WindowAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class WindowEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicToolBarUI;
+            class BasicToolBarUI$FrameListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicToolBarUI$FrameListener : public ::java::awt::event::WindowAdapter
+{
+
+public: // actually protected
+  BasicToolBarUI$FrameListener(::javax::swing::plaf::basic::BasicToolBarUI *);
+public:
+  virtual void windowClosing(::java::awt::event::WindowEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicToolBarUI * __attribute__((aligned(__alignof__( ::java::awt::event::WindowAdapter)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicToolBarUI$FrameListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI$PropertyListener.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI$PropertyListener.h
new file mode 100644
index 000000000..39dafa84a
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicToolBarUI$PropertyListener.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicToolBarUI$PropertyListener__
+#define __javax_swing_plaf_basic_BasicToolBarUI$PropertyListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicToolBarUI;
+            class BasicToolBarUI$PropertyListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicToolBarUI$PropertyListener : public ::java::lang::Object
+{
+
+public: // actually protected
+  BasicToolBarUI$PropertyListener(::javax::swing::plaf::basic::BasicToolBarUI *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicToolBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicToolBarUI$PropertyListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarAction.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarAction.h
new file mode 100644
index 000000000..ff10a58dd
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarAction.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicToolBarUI$ToolBarAction__
+#define __javax_swing_plaf_basic_BasicToolBarUI$ToolBarAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicToolBarUI$ToolBarAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicToolBarUI$ToolBarAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually package-private
+  BasicToolBarUI$ToolBarAction();
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  static jboolean $assertionsDisabled;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicToolBarUI$ToolBarAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarBorder.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarBorder.h
new file mode 100644
index 000000000..bcdc5378b
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarBorder.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicToolBarUI$ToolBarBorder__
+#define __javax_swing_plaf_basic_BasicToolBarUI$ToolBarBorder__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicToolBarUI$ToolBarBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicToolBarUI$ToolBarBorder : public ::java::lang::Object
+{
+
+  BasicToolBarUI$ToolBarBorder();
+public:
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual jboolean isBorderOpaque();
+private:
+  void paintBumps(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::awt::Color *);
+public:
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+private:
+  static const jint offset = 10;
+  static const jint regular = 2;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicToolBarUI$ToolBarBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarContListener.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarContListener.h
new file mode 100644
index 000000000..0b5d6690d
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarContListener.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicToolBarUI$ToolBarContListener__
+#define __javax_swing_plaf_basic_BasicToolBarUI$ToolBarContListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ContainerEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicToolBarUI;
+            class BasicToolBarUI$ToolBarContListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicToolBarUI$ToolBarContListener : public ::java::lang::Object
+{
+
+public: // actually protected
+  BasicToolBarUI$ToolBarContListener(::javax::swing::plaf::basic::BasicToolBarUI *);
+public:
+  virtual void componentAdded(::java::awt::event::ContainerEvent *);
+  virtual void componentRemoved(::java::awt::event::ContainerEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicToolBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicToolBarUI$ToolBarContListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarDialog.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarDialog.h
new file mode 100644
index 000000000..b7ee7b89f
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarDialog.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicToolBarUI$ToolBarDialog__
+#define __javax_swing_plaf_basic_BasicToolBarUI$ToolBarDialog__
+
+#pragma interface
+
+#include <javax/swing/JDialog.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicToolBarUI;
+            class BasicToolBarUI$ToolBarDialog;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicToolBarUI$ToolBarDialog : public ::javax::swing::JDialog
+{
+
+public:
+  BasicToolBarUI$ToolBarDialog(::javax::swing::plaf::basic::BasicToolBarUI *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicToolBarUI * __attribute__((aligned(__alignof__( ::javax::swing::JDialog)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicToolBarUI$ToolBarDialog__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarFocusListener.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarFocusListener.h
new file mode 100644
index 000000000..4b5f7de72
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarFocusListener.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicToolBarUI$ToolBarFocusListener__
+#define __javax_swing_plaf_basic_BasicToolBarUI$ToolBarFocusListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class FocusEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicToolBarUI;
+            class BasicToolBarUI$ToolBarFocusListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicToolBarUI$ToolBarFocusListener : public ::java::lang::Object
+{
+
+public: // actually protected
+  BasicToolBarUI$ToolBarFocusListener(::javax::swing::plaf::basic::BasicToolBarUI *);
+public:
+  virtual void focusGained(::java::awt::event::FocusEvent *);
+  virtual void focusLost(::java::awt::event::FocusEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicToolBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicToolBarUI$ToolBarFocusListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI.h
new file mode 100644
index 000000000..3b3c14978
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicToolBarUI.h
@@ -0,0 +1,170 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicToolBarUI__
+#define __javax_swing_plaf_basic_BasicToolBarUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ToolBarUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Container;
+        class Dimension;
+        class Point;
+        class Window;
+      namespace event
+      {
+          class ContainerListener;
+          class FocusListener;
+          class WindowListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ActionMap;
+        class JComponent;
+        class JFrame;
+        class JToolBar;
+        class KeyStroke;
+        class RootPaneContainer;
+      namespace border
+      {
+          class Border;
+      }
+      namespace event
+      {
+          class MouseInputListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicToolBarUI;
+            class BasicToolBarUI$DragWindow;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicToolBarUI : public ::javax::swing::plaf::ToolBarUI
+{
+
+public:
+  BasicToolBarUI();
+  virtual jboolean canDock(::java::awt::Component *, ::java::awt::Point *);
+private:
+  jint areaOfClick(::java::awt::Component *, ::java::awt::Point *);
+public: // actually protected
+  virtual ::javax::swing::event::MouseInputListener * createDockingListener();
+  virtual ::javax::swing::plaf::basic::BasicToolBarUI$DragWindow * createDragWindow(::javax::swing::JToolBar *);
+  virtual ::javax::swing::JFrame * createFloatingFrame(::javax::swing::JToolBar *);
+  virtual ::javax::swing::RootPaneContainer * createFloatingWindow(::javax::swing::JToolBar *);
+  virtual ::java::awt::event::WindowListener * createFrameListener();
+  virtual ::javax::swing::border::Border * createNonRolloverBorder();
+  virtual ::java::beans::PropertyChangeListener * createPropertyListener();
+  virtual ::javax::swing::border::Border * createRolloverBorder();
+  virtual ::java::awt::event::ContainerListener * createToolBarContListener();
+  virtual ::java::awt::event::FocusListener * createToolBarFocusListener();
+public:
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void dragTo(::java::awt::Point *, ::java::awt::Point *);
+  virtual void floatAt(::java::awt::Point *, ::java::awt::Point *);
+public:
+  virtual ::java::awt::Color * getDockingColor();
+  virtual ::java::awt::Color * getFloatingColor();
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installComponents();
+  virtual void installDefaults();
+  virtual void installKeyboardActions();
+private:
+  ::javax::swing::ActionMap * getActionMap();
+  ::javax::swing::ActionMap * createDefaultActions();
+public: // actually protected
+  virtual void installListeners();
+  virtual void installNonRolloverBorders(::javax::swing::JComponent *);
+  virtual void installNormalBorders(::javax::swing::JComponent *);
+  virtual void installRolloverBorders(::javax::swing::JComponent *);
+private:
+  void fillHashtable();
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual jboolean isFloating();
+  virtual jboolean isRolloverBorders();
+public: // actually protected
+  virtual void navigateFocusedComp(jint);
+  virtual void setBorderToNonRollover(::java::awt::Component *);
+  virtual void setBorderToNormal(::java::awt::Component *);
+  virtual void setBorderToRollover(::java::awt::Component *);
+public:
+  virtual void setDockingColor(::java::awt::Color *);
+  virtual void setFloating(jboolean, ::java::awt::Point *);
+  virtual void setFloatingColor(::java::awt::Color *);
+  virtual void setFloatingLocation(jint, jint);
+  virtual void setOrientation(jint);
+  virtual void setRolloverBorders(jboolean);
+public: // actually protected
+  virtual void uninstallComponents();
+  virtual void uninstallDefaults();
+  virtual void uninstallKeyboardActions();
+  virtual void uninstallListeners();
+public:
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually package-private
+  static ::javax::swing::JFrame * owner;
+private:
+  static ::javax::swing::border::Border * nonRolloverBorder;
+  static ::javax::swing::border::Border * rolloverBorder;
+public: // actually protected
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ToolBarUI)))) constraintBeforeFloating;
+public: // actually package-private
+  jint lastGoodOrientation;
+public: // actually protected
+  ::java::awt::Color * dockingBorderColor;
+  ::java::awt::Color * dockingColor;
+  ::javax::swing::event::MouseInputListener * dockingListener;
+  ::javax::swing::plaf::basic::BasicToolBarUI$DragWindow * dragWindow;
+  ::java::awt::Color * floatingBorderColor;
+  ::java::awt::Color * floatingColor;
+  jint focusedCompIndex;
+  ::java::beans::PropertyChangeListener * propertyListener;
+  ::javax::swing::JToolBar * toolBar;
+  ::java::awt::event::ContainerListener * toolBarContListener;
+  ::java::awt::event::FocusListener * toolBarFocusListener;
+  ::javax::swing::KeyStroke * leftKey;
+  ::javax::swing::KeyStroke * rightKey;
+  ::javax::swing::KeyStroke * upKey;
+  ::javax::swing::KeyStroke * downKey;
+private:
+  ::java::awt::Window * floatFrame;
+public: // actually package-private
+  ::java::awt::Container * origParent;
+  ::java::util::Hashtable * borders;
+private:
+  ::java::awt::event::WindowListener * windowListener;
+public: // actually package-private
+  ::java::awt::Dimension * cachedBounds;
+  jint cachedOrientation;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicToolBarUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolTipUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicToolTipUI$PropertyChangeHandler.h
new file mode 100644
index 000000000..9bc19d1ba
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicToolTipUI$PropertyChangeHandler.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicToolTipUI$PropertyChangeHandler__
+#define __javax_swing_plaf_basic_BasicToolTipUI$PropertyChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicToolTipUI;
+            class BasicToolTipUI$PropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicToolTipUI$PropertyChangeHandler : public ::java::lang::Object
+{
+
+  BasicToolTipUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicToolTipUI *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  BasicToolTipUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicToolTipUI *, ::javax::swing::plaf::basic::BasicToolTipUI$PropertyChangeHandler *);
+  ::javax::swing::plaf::basic::BasicToolTipUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicToolTipUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolTipUI.h b/libjava/javax/swing/plaf/basic/BasicToolTipUI.h
new file mode 100644
index 000000000..a204e00e1
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicToolTipUI.h
@@ -0,0 +1,69 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicToolTipUI__
+#define __javax_swing_plaf_basic_BasicToolTipUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ToolTipUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicToolTipUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicToolTipUI : public ::javax::swing::plaf::ToolTipUI
+{
+
+public:
+  BasicToolTipUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installDefaults(::javax::swing::JComponent *);
+  virtual void installListeners(::javax::swing::JComponent *);
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+public: // actually protected
+  virtual void uninstallDefaults(::javax::swing::JComponent *);
+  virtual void uninstallListeners(::javax::swing::JComponent *);
+public:
+  virtual void uninstallUI(::javax::swing::JComponent *);
+private:
+  static ::javax::swing::plaf::basic::BasicToolTipUI * shared;
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ToolTipUI)))) text;
+  ::java::beans::PropertyChangeListener * propertyChangeHandler;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicToolTipUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$1.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$1.h
new file mode 100644
index 000000000..3578f4779
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$1.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$1__
+#define __javax_swing_plaf_basic_BasicTreeUI$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicTreeUI$1(::javax::swing::plaf::basic::BasicTreeUI *);
+public:
+  virtual jint getIconHeight();
+  virtual jint getIconWidth();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$CellEditorHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$CellEditorHandler.h
new file mode 100644
index 000000000..07bc329e3
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$CellEditorHandler.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$CellEditorHandler__
+#define __javax_swing_plaf_basic_BasicTreeUI$CellEditorHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ChangeEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$CellEditorHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$CellEditorHandler : public ::java::lang::Object
+{
+
+public:
+  BasicTreeUI$CellEditorHandler(::javax::swing::plaf::basic::BasicTreeUI *);
+  virtual void editingStopped(::javax::swing::event::ChangeEvent *);
+  virtual void editingCanceled(::javax::swing::event::ChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$CellEditorHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$ComponentHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$ComponentHandler.h
new file mode 100644
index 000000000..ec6d81857
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$ComponentHandler.h
@@ -0,0 +1,62 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$ComponentHandler__
+#define __javax_swing_plaf_basic_BasicTreeUI$ComponentHandler__
+
+#pragma interface
+
+#include <java/awt/event/ComponentAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+          class ComponentEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JScrollBar;
+        class JScrollPane;
+        class Timer;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$ComponentHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$ComponentHandler : public ::java::awt::event::ComponentAdapter
+{
+
+public:
+  BasicTreeUI$ComponentHandler(::javax::swing::plaf::basic::BasicTreeUI *);
+  virtual void componentMoved(::java::awt::event::ComponentEvent *);
+public: // actually protected
+  virtual void startTimer();
+  virtual ::javax::swing::JScrollPane * getScrollPane();
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually protected
+  ::javax::swing::Timer * __attribute__((aligned(__alignof__( ::java::awt::event::ComponentAdapter)))) timer;
+  ::javax::swing::JScrollBar * scrollBar;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$ComponentHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$FocusHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$FocusHandler.h
new file mode 100644
index 000000000..232e989a2
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$FocusHandler.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$FocusHandler__
+#define __javax_swing_plaf_basic_BasicTreeUI$FocusHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class FocusEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$FocusHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$FocusHandler : public ::java::lang::Object
+{
+
+public:
+  BasicTreeUI$FocusHandler(::javax::swing::plaf::basic::BasicTreeUI *);
+  virtual void focusGained(::java::awt::event::FocusEvent *);
+  virtual void focusLost(::java::awt::event::FocusEvent *);
+public: // actually package-private
+  virtual void repaintLeadRow();
+  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$FocusHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$KeyHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$KeyHandler.h
new file mode 100644
index 000000000..2be990a8e
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$KeyHandler.h
@@ -0,0 +1,59 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$KeyHandler__
+#define __javax_swing_plaf_basic_BasicTreeUI$KeyHandler__
+
+#pragma interface
+
+#include <java/awt/event/KeyAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class KeyEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Action;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$KeyHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$KeyHandler : public ::java::awt::event::KeyAdapter
+{
+
+public:
+  BasicTreeUI$KeyHandler(::javax::swing::plaf::basic::BasicTreeUI *);
+  virtual void keyTyped(::java::awt::event::KeyEvent *);
+public: // actually package-private
+  virtual jboolean checkMatch(jint, jchar);
+public:
+  virtual void keyPressed(::java::awt::event::KeyEvent *);
+  virtual void keyReleased(::java::awt::event::KeyEvent *);
+public: // actually protected
+  ::javax::swing::Action * __attribute__((aligned(__alignof__( ::java::awt::event::KeyAdapter)))) repeatKeyAction;
+  jboolean isKeyDown;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$KeyHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$MouseHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$MouseHandler.h
new file mode 100644
index 000000000..2a0893ba2
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$MouseHandler.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$MouseHandler__
+#define __javax_swing_plaf_basic_BasicTreeUI$MouseHandler__
+
+#pragma interface
+
+#include <java/awt/event/MouseAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$MouseHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$MouseHandler : public ::java::awt::event::MouseAdapter
+{
+
+public:
+  BasicTreeUI$MouseHandler(::javax::swing::plaf::basic::BasicTreeUI *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+private:
+  void handleEvent(::java::awt::event::MouseEvent *);
+  jboolean __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) selectedOnPress;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$MouseHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$MouseInputHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$MouseInputHandler.h
new file mode 100644
index 000000000..574d8b56a
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$MouseInputHandler.h
@@ -0,0 +1,64 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$MouseInputHandler__
+#define __javax_swing_plaf_basic_BasicTreeUI$MouseInputHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$MouseInputHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$MouseInputHandler : public ::java::lang::Object
+{
+
+public:
+  BasicTreeUI$MouseInputHandler(::javax::swing::plaf::basic::BasicTreeUI *, ::java::awt::Component *, ::java::awt::Component *, ::java::awt::event::MouseEvent *);
+  virtual void mouseClicked(::java::awt::event::MouseEvent *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+  virtual void mouseEntered(::java::awt::event::MouseEvent *);
+  virtual void mouseExited(::java::awt::event::MouseEvent *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+public: // actually protected
+  virtual void removeFromSource();
+private:
+  void dispatch(::java::awt::event::MouseEvent *);
+public: // actually protected
+  ::java::awt::Component * __attribute__((aligned(__alignof__( ::java::lang::Object)))) source;
+  ::java::awt::Component * destination;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$MouseInputHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$NodeDimensionsHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$NodeDimensionsHandler.h
new file mode 100644
index 000000000..352a37067
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$NodeDimensionsHandler.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$NodeDimensionsHandler__
+#define __javax_swing_plaf_basic_BasicTreeUI$NodeDimensionsHandler__
+
+#pragma interface
+
+#include <javax/swing/tree/AbstractLayoutCache$NodeDimensions.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$NodeDimensionsHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$NodeDimensionsHandler : public ::javax::swing::tree::AbstractLayoutCache$NodeDimensions
+{
+
+public:
+  BasicTreeUI$NodeDimensionsHandler(::javax::swing::plaf::basic::BasicTreeUI *);
+  virtual ::java::awt::Rectangle * getNodeDimensions(::java::lang::Object *, jint, jint, jboolean, ::java::awt::Rectangle *);
+public: // actually protected
+  virtual jint getRowX(jint, jint);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::javax::swing::tree::AbstractLayoutCache$NodeDimensions)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$NodeDimensionsHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$PropertyChangeHandler.h
new file mode 100644
index 000000000..54386de9c
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$PropertyChangeHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$PropertyChangeHandler__
+#define __javax_swing_plaf_basic_BasicTreeUI$PropertyChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$PropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$PropertyChangeHandler : public ::java::lang::Object
+{
+
+public:
+  BasicTreeUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicTreeUI *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$SelectionModelPropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$SelectionModelPropertyChangeHandler.h
new file mode 100644
index 000000000..52b52d1c3
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$SelectionModelPropertyChangeHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$SelectionModelPropertyChangeHandler__
+#define __javax_swing_plaf_basic_BasicTreeUI$SelectionModelPropertyChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$SelectionModelPropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$SelectionModelPropertyChangeHandler : public ::java::lang::Object
+{
+
+public:
+  BasicTreeUI$SelectionModelPropertyChangeHandler(::javax::swing::plaf::basic::BasicTreeUI *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$SelectionModelPropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeCancelEditingAction.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeCancelEditingAction.h
new file mode 100644
index 000000000..b64ba698e
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeCancelEditingAction.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreeCancelEditingAction__
+#define __javax_swing_plaf_basic_BasicTreeUI$TreeCancelEditingAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$TreeCancelEditingAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$TreeCancelEditingAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicTreeUI$TreeCancelEditingAction(::javax::swing::plaf::basic::BasicTreeUI *, ::java::lang::String *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$TreeCancelEditingAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeExpansionHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeExpansionHandler.h
new file mode 100644
index 000000000..52ba7c8bb
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeExpansionHandler.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreeExpansionHandler__
+#define __javax_swing_plaf_basic_BasicTreeUI$TreeExpansionHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class TreeExpansionEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$TreeExpansionHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$TreeExpansionHandler : public ::java::lang::Object
+{
+
+public:
+  BasicTreeUI$TreeExpansionHandler(::javax::swing::plaf::basic::BasicTreeUI *);
+  virtual void treeExpanded(::javax::swing::event::TreeExpansionEvent *);
+  virtual void treeCollapsed(::javax::swing::event::TreeExpansionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$TreeExpansionHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeHomeAction.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeHomeAction.h
new file mode 100644
index 000000000..1b25c1164
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeHomeAction.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreeHomeAction__
+#define __javax_swing_plaf_basic_BasicTreeUI$TreeHomeAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$TreeHomeAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$TreeHomeAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicTreeUI$TreeHomeAction(::javax::swing::plaf::basic::BasicTreeUI *, jint, ::java::lang::String *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual jboolean isEnabled();
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) direction;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$TreeHomeAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeIncrementAction.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeIncrementAction.h
new file mode 100644
index 000000000..03ed85217
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeIncrementAction.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreeIncrementAction__
+#define __javax_swing_plaf_basic_BasicTreeUI$TreeIncrementAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$TreeIncrementAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$TreeIncrementAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicTreeUI$TreeIncrementAction(::javax::swing::plaf::basic::BasicTreeUI *, jint, ::java::lang::String *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual jboolean isEnabled();
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) direction;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$TreeIncrementAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeModelHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeModelHandler.h
new file mode 100644
index 000000000..9ea526850
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeModelHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreeModelHandler__
+#define __javax_swing_plaf_basic_BasicTreeUI$TreeModelHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class TreeModelEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$TreeModelHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$TreeModelHandler : public ::java::lang::Object
+{
+
+public:
+  BasicTreeUI$TreeModelHandler(::javax::swing::plaf::basic::BasicTreeUI *);
+  virtual void treeNodesChanged(::javax::swing::event::TreeModelEvent *);
+  virtual void treeNodesInserted(::javax::swing::event::TreeModelEvent *);
+  virtual void treeNodesRemoved(::javax::swing::event::TreeModelEvent *);
+  virtual void treeStructureChanged(::javax::swing::event::TreeModelEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$TreeModelHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreePageAction.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreePageAction.h
new file mode 100644
index 000000000..5cb1725d4
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreePageAction.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreePageAction__
+#define __javax_swing_plaf_basic_BasicTreeUI$TreePageAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$TreePageAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$TreePageAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicTreeUI$TreePageAction(::javax::swing::plaf::basic::BasicTreeUI *, jint, ::java::lang::String *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual jboolean isEnabled();
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) direction;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$TreePageAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeSelectionHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeSelectionHandler.h
new file mode 100644
index 000000000..73ff33b1c
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeSelectionHandler.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreeSelectionHandler__
+#define __javax_swing_plaf_basic_BasicTreeUI$TreeSelectionHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class TreeSelectionEvent;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$TreeSelectionHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$TreeSelectionHandler : public ::java::lang::Object
+{
+
+public:
+  BasicTreeUI$TreeSelectionHandler(::javax::swing::plaf::basic::BasicTreeUI *);
+  virtual void valueChanged(::javax::swing::event::TreeSelectionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$TreeSelectionHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeStartEditingAction.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeStartEditingAction.h
new file mode 100644
index 000000000..fa01f97dd
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeStartEditingAction.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreeStartEditingAction__
+#define __javax_swing_plaf_basic_BasicTreeUI$TreeStartEditingAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$TreeStartEditingAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$TreeStartEditingAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicTreeUI$TreeStartEditingAction(::javax::swing::plaf::basic::BasicTreeUI *, ::java::lang::String *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$TreeStartEditingAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeToggleAction.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeToggleAction.h
new file mode 100644
index 000000000..59b5c5e2e
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeToggleAction.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreeToggleAction__
+#define __javax_swing_plaf_basic_BasicTreeUI$TreeToggleAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$TreeToggleAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$TreeToggleAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicTreeUI$TreeToggleAction(::javax::swing::plaf::basic::BasicTreeUI *, ::java::lang::String *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual jboolean isEnabled();
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$TreeToggleAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeTraverseAction.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeTraverseAction.h
new file mode 100644
index 000000000..617dbd652
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeTraverseAction.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreeTraverseAction__
+#define __javax_swing_plaf_basic_BasicTreeUI$TreeTraverseAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicTreeUI;
+            class BasicTreeUI$TreeTraverseAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI$TreeTraverseAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  BasicTreeUI$TreeTraverseAction(::javax::swing::plaf::basic::BasicTreeUI *, jint, ::java::lang::String *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  virtual jboolean isEnabled();
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) direction;
+public: // actually package-private
+  ::javax::swing::plaf::basic::BasicTreeUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI$TreeTraverseAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI.h b/libjava/javax/swing/plaf/basic/BasicTreeUI.h
new file mode 100644
index 000000000..42159f13b
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI.h
@@ -0,0 +1,279 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicTreeUI__
+#define __javax_swing_plaf_basic_BasicTreeUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/TreeUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Dimension;
+        class Graphics;
+        class Insets;
+        class Rectangle;
+      namespace event
+      {
+          class ComponentListener;
+          class FocusListener;
+          class KeyListener;
+          class MouseEvent;
+          class MouseListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ActionMap;
+        class CellRendererPane;
+        class Icon;
+        class JComponent;
+        class JTree;
+      namespace event
+      {
+          class CellEditorListener;
+          class TreeExpansionListener;
+          class TreeModelListener;
+          class TreeSelectionListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicTreeUI;
+        }
+      }
+      namespace tree
+      {
+          class AbstractLayoutCache;
+          class AbstractLayoutCache$NodeDimensions;
+          class TreeCellEditor;
+          class TreeCellRenderer;
+          class TreeModel;
+          class TreePath;
+          class TreeSelectionModel;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicTreeUI : public ::javax::swing::plaf::TreeUI
+{
+
+public:
+  BasicTreeUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::awt::Color * getHashColor();
+  virtual void setHashColor(::java::awt::Color *);
+public:
+  virtual void setLeftChildIndent(jint);
+  virtual jint getLeftChildIndent();
+  virtual void setRightChildIndent(jint);
+  virtual jint getRightChildIndent();
+  virtual void setExpandedIcon(::javax::swing::Icon *);
+  virtual ::javax::swing::Icon * getExpandedIcon();
+  virtual void setCollapsedIcon(::javax::swing::Icon *);
+  virtual ::javax::swing::Icon * getCollapsedIcon();
+public: // actually protected
+  virtual void setLargeModel(jboolean);
+  virtual jboolean isLargeModel();
+  virtual void setRowHeight(jint);
+  virtual jint getRowHeight();
+  virtual void setCellRenderer(::javax::swing::tree::TreeCellRenderer *);
+  virtual ::javax::swing::tree::TreeCellRenderer * getCellRenderer();
+  virtual void setModel(::javax::swing::tree::TreeModel *);
+  virtual ::javax::swing::tree::TreeModel * getModel();
+  virtual void setRootVisible(jboolean);
+  virtual jboolean isRootVisible();
+  virtual void setShowsRootHandles(jboolean);
+  virtual jboolean getShowsRootHandles();
+  virtual void setCellEditor(::javax::swing::tree::TreeCellEditor *);
+  virtual ::javax::swing::tree::TreeCellEditor * getCellEditor();
+  virtual void setEditable(jboolean);
+  virtual jboolean isEditable();
+  virtual void setSelectionModel(::javax::swing::tree::TreeSelectionModel *);
+  virtual ::javax::swing::tree::TreeSelectionModel * getSelectionModel();
+public:
+  virtual ::java::awt::Rectangle * getPathBounds(::javax::swing::JTree *, ::javax::swing::tree::TreePath *);
+public: // actually package-private
+  virtual jint getMaxHeight(::javax::swing::JTree *);
+  virtual ::javax::swing::Icon * getNodeIcon(::javax::swing::tree::TreePath *);
+public:
+  virtual ::javax::swing::tree::TreePath * getPathForRow(::javax::swing::JTree *, jint);
+  virtual jint getRowForPath(::javax::swing::JTree *, ::javax::swing::tree::TreePath *);
+  virtual jint getRowCount(::javax::swing::JTree *);
+  virtual ::javax::swing::tree::TreePath * getClosestPathForLocation(::javax::swing::JTree *, jint, jint);
+  virtual jboolean isEditing(::javax::swing::JTree *);
+  virtual jboolean stopEditing(::javax::swing::JTree *);
+  virtual void cancelEditing(::javax::swing::JTree *);
+  virtual void startEditingAtPath(::javax::swing::JTree *, ::javax::swing::tree::TreePath *);
+  virtual ::javax::swing::tree::TreePath * getEditingPath(::javax::swing::JTree *);
+public: // actually protected
+  virtual void prepareForUIInstall();
+  virtual void completeUIInstall();
+  virtual void completeUIUninstall();
+  virtual void installComponents();
+  virtual ::javax::swing::tree::AbstractLayoutCache$NodeDimensions * createNodeDimensions();
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
+  virtual ::java::awt::event::MouseListener * createMouseListener();
+  virtual ::java::awt::event::FocusListener * createFocusListener();
+  virtual ::java::awt::event::KeyListener * createKeyListener();
+  virtual ::java::beans::PropertyChangeListener * createSelectionModelPropertyChangeListener();
+  virtual ::javax::swing::event::TreeSelectionListener * createTreeSelectionListener();
+  virtual ::javax::swing::event::CellEditorListener * createCellEditorListener();
+  virtual ::java::awt::event::ComponentListener * createComponentListener();
+  virtual ::javax::swing::event::TreeExpansionListener * createTreeExpansionListener();
+  virtual ::javax::swing::tree::AbstractLayoutCache * createLayoutCache();
+  virtual ::javax::swing::CellRendererPane * createCellRendererPane();
+  virtual ::javax::swing::tree::TreeCellEditor * createDefaultCellEditor();
+  virtual ::javax::swing::tree::TreeCellRenderer * createDefaultCellRenderer();
+  virtual ::javax::swing::event::TreeModelListener * createTreeModelListener();
+  virtual void uninstallListeners();
+  virtual void uninstallKeyboardActions();
+  virtual void uninstallComponents();
+  virtual jint getVerticalLegBuffer();
+  virtual jint getHorizontalLegBuffer();
+  virtual void updateLayoutCacheExpandedNodes();
+  virtual void updateExpandedDescendants(::javax::swing::tree::TreePath *);
+  virtual ::javax::swing::tree::TreePath * getLastChildPath(::javax::swing::tree::TreePath *);
+  virtual void updateDepthOffset();
+  virtual void updateCellEditor();
+  virtual void updateRenderer();
+  virtual void configureLayoutCache();
+  virtual void updateSize();
+  virtual void updateCachedPreferredSize();
+  virtual void pathWasExpanded(::javax::swing::tree::TreePath *);
+  virtual void pathWasCollapsed(::javax::swing::tree::TreePath *);
+  virtual void installDefaults();
+  virtual void installKeyboardActions();
+private:
+  ::javax::swing::ActionMap * getActionMap();
+  ::javax::swing::ActionMap * createDefaultActions();
+  jint convertModifiers(jint);
+public: // actually protected
+  virtual void installListeners();
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void uninstallDefaults();
+public:
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+private:
+  jboolean isLastChild(::javax::swing::tree::TreePath *);
+public: // actually protected
+  virtual void ensureRowsAreVisible(jint, jint);
+public:
+  virtual void setPreferredMinSize(::java::awt::Dimension *);
+  virtual ::java::awt::Dimension * getPreferredMinSize();
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *, jboolean);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void completeEditing();
+  virtual void completeEditing(jboolean, jboolean, jboolean);
+  virtual jboolean startEditing(::javax::swing::tree::TreePath *, ::java::awt::event::MouseEvent *);
+private:
+  void editorRequestFocus(::java::awt::Component *);
+public: // actually protected
+  virtual void checkForClickInExpandControl(::javax::swing::tree::TreePath *, jint, jint);
+  virtual jboolean isLocationInExpandControl(::javax::swing::tree::TreePath *, jint, jint);
+  virtual void handleExpandControlClick(::javax::swing::tree::TreePath *, jint, jint);
+  virtual void toggleExpandState(::javax::swing::tree::TreePath *);
+  virtual jboolean isToggleSelectionEvent(::java::awt::event::MouseEvent *);
+  virtual jboolean isMultiSelectEvent(::java::awt::event::MouseEvent *);
+  virtual jboolean isToggleEvent(::java::awt::event::MouseEvent *);
+  virtual void selectPathForEvent(::javax::swing::tree::TreePath *, ::java::awt::event::MouseEvent *);
+  virtual jboolean isLeaf(jint);
+public: // actually package-private
+  virtual jboolean hasControlIcons();
+  virtual ::javax::swing::Icon * getCurrentControlIcon(::javax::swing::tree::TreePath *);
+  virtual ::java::lang::Object * getParent(::java::lang::Object *, ::java::lang::Object *);
+private:
+  ::java::lang::Object * findNode(::java::lang::Object *, ::java::lang::Object *);
+public: // actually package-private
+  virtual void selectPath(::javax::swing::JTree *, ::javax::swing::tree::TreePath *);
+  virtual JArray< ::java::lang::Object * > * getPathToRoot(::java::lang::Object *, jint);
+public: // actually protected
+  virtual void paintVerticalLine(::java::awt::Graphics *, ::javax::swing::JComponent *, jint, jint, jint);
+  virtual void paintHorizontalLine(::java::awt::Graphics *, ::javax::swing::JComponent *, jint, jint, jint);
+  virtual void drawCentered(::java::awt::Component *, ::java::awt::Graphics *, ::javax::swing::Icon *, jint, jint);
+  virtual void drawDashedHorizontalLine(::java::awt::Graphics *, jint, jint, jint);
+  virtual void drawDashedVerticalLine(::java::awt::Graphics *, jint, jint, jint);
+  virtual void paintExpandControl(::java::awt::Graphics *, ::java::awt::Rectangle *, ::java::awt::Insets *, ::java::awt::Rectangle *, ::javax::swing::tree::TreePath *, jint, jboolean, jboolean, jboolean);
+  virtual void paintHorizontalPartOfLeg(::java::awt::Graphics *, ::java::awt::Rectangle *, ::java::awt::Insets *, ::java::awt::Rectangle *, ::javax::swing::tree::TreePath *, jint, jboolean, jboolean, jboolean);
+  virtual void paintVerticalPartOfLeg(::java::awt::Graphics *, ::java::awt::Rectangle *, ::java::awt::Insets *, ::javax::swing::tree::TreePath *);
+  virtual void paintRow(::java::awt::Graphics *, ::java::awt::Rectangle *, ::java::awt::Insets *, ::java::awt::Rectangle *, ::javax::swing::tree::TreePath *, jint, jboolean, jboolean, jboolean);
+  virtual void prepareForUIUninstall();
+  virtual jboolean shouldPaintExpandControl(::javax::swing::tree::TreePath *, jint, jboolean, jboolean, jboolean);
+  virtual jint getRowX(jint, jint);
+public: // actually package-private
+  static jint WAIT_TILL_EDITING;
+public: // actually protected
+  ::javax::swing::Icon * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TreeUI)))) collapsedIcon;
+  ::javax::swing::Icon * expandedIcon;
+  jint leftChildIndent;
+  jint rightChildIndent;
+  jint totalChildIndent;
+  jint lastSelectedRow;
+  ::javax::swing::JTree * tree;
+  ::javax::swing::tree::TreeCellRenderer * currentCellRenderer;
+  jboolean createdRenderer;
+  ::javax::swing::tree::TreeCellEditor * cellEditor;
+  jboolean createdCellEditor;
+  jboolean stopEditingInCompleteEditing;
+  ::javax::swing::CellRendererPane * rendererPane;
+  ::java::awt::Dimension * preferredSize;
+  ::java::awt::Dimension * preferredMinSize;
+  jboolean validCachedPreferredSize;
+  ::javax::swing::tree::AbstractLayoutCache * treeState;
+  ::java::util::Hashtable * drawingCache;
+  jboolean largeModel;
+  ::javax::swing::tree::AbstractLayoutCache$NodeDimensions * nodeDimensions;
+  ::javax::swing::tree::TreeModel * treeModel;
+  ::javax::swing::tree::TreeSelectionModel * treeSelectionModel;
+  jint depthOffset;
+  ::java::awt::Component * editingComponent;
+  ::javax::swing::tree::TreePath * editingPath;
+  jint editingRow;
+  jboolean editorHasDifferentSize;
+public: // actually package-private
+  jboolean isEditing__;
+  ::javax::swing::tree::TreePath * currentVisiblePath;
+  jint gap;
+  jint maxHeight;
+  ::java::awt::Color * hashColor;
+  ::java::beans::PropertyChangeListener * propertyChangeListener;
+  ::java::awt::event::FocusListener * focusListener;
+  ::javax::swing::event::TreeSelectionListener * treeSelectionListener;
+  ::java::awt::event::MouseListener * mouseListener;
+  ::java::awt::event::KeyListener * keyListener;
+  ::java::beans::PropertyChangeListener * selectionModelPropertyChangeListener;
+  ::java::awt::event::ComponentListener * componentListener;
+  ::javax::swing::event::CellEditorListener * cellEditorListener;
+  ::javax::swing::event::TreeExpansionListener * treeExpansionListener;
+  ::javax::swing::event::TreeModelListener * treeModelListener;
+  static ::javax::swing::Icon * nullIcon;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicTreeUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicViewportUI.h b/libjava/javax/swing/plaf/basic/BasicViewportUI.h
new file mode 100644
index 000000000..f657f7dc0
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/BasicViewportUI.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_BasicViewportUI__
+#define __javax_swing_plaf_basic_BasicViewportUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ViewportUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicViewportUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::BasicViewportUI : public ::javax::swing::plaf::ViewportUI
+{
+
+public:
+  BasicViewportUI();
+public: // actually protected
+  virtual void installDefaults(::javax::swing::JComponent *);
+  virtual void uninstallDefaults(::javax::swing::JComponent *);
+public:
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_BasicViewportUI__
diff --git a/libjava/javax/swing/plaf/basic/ComboPopup.h b/libjava/javax/swing/plaf/basic/ComboPopup.h
new file mode 100644
index 000000000..9f01bedb3
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/ComboPopup.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_ComboPopup__
+#define __javax_swing_plaf_basic_ComboPopup__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class KeyListener;
+          class MouseListener;
+          class MouseMotionListener;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JList;
+      namespace plaf
+      {
+        namespace basic
+        {
+            class ComboPopup;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::ComboPopup : public ::java::lang::Object
+{
+
+public:
+  virtual void show() = 0;
+  virtual void hide() = 0;
+  virtual jboolean isVisible() = 0;
+  virtual ::javax::swing::JList * getList() = 0;
+  virtual ::java::awt::event::MouseListener * getMouseListener() = 0;
+  virtual ::java::awt::event::MouseMotionListener * getMouseMotionListener() = 0;
+  virtual ::java::awt::event::KeyListener * getKeyListener() = 0;
+  virtual void uninstallingUI() = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_plaf_basic_ComboPopup__
diff --git a/libjava/javax/swing/plaf/basic/DefaultMenuLayout.h b/libjava/javax/swing/plaf/basic/DefaultMenuLayout.h
new file mode 100644
index 000000000..15b06f2a8
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/DefaultMenuLayout.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_DefaultMenuLayout__
+#define __javax_swing_plaf_basic_DefaultMenuLayout__
+
+#pragma interface
+
+#include <javax/swing/BoxLayout.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Container;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class DefaultMenuLayout;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::DefaultMenuLayout : public ::javax::swing::BoxLayout
+{
+
+public:
+  DefaultMenuLayout(::java::awt::Container *, jint);
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_DefaultMenuLayout__
diff --git a/libjava/javax/swing/plaf/basic/SharedUIDefaults.h b/libjava/javax/swing/plaf/basic/SharedUIDefaults.h
new file mode 100644
index 000000000..7db5a2f3b
--- /dev/null
+++ b/libjava/javax/swing/plaf/basic/SharedUIDefaults.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_basic_SharedUIDefaults__
+#define __javax_swing_plaf_basic_SharedUIDefaults__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace basic
+        {
+            class SharedUIDefaults;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::basic::SharedUIDefaults : public ::java::lang::Object
+{
+
+public:
+  SharedUIDefaults();
+public: // actually package-private
+  static ::java::lang::Object * get(::java::lang::String *);
+  static ::java::awt::Color * getColor(::java::lang::String *);
+private:
+  static ::java::util::HashMap * sharedDefaults;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_basic_SharedUIDefaults__
diff --git a/libjava/javax/swing/plaf/metal/DefaultMetalTheme.h b/libjava/javax/swing/plaf/metal/DefaultMetalTheme.h
new file mode 100644
index 000000000..8ce9a8c1b
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/DefaultMetalTheme.h
@@ -0,0 +1,73 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_DefaultMetalTheme__
+#define __javax_swing_plaf_metal_DefaultMetalTheme__
+
+#pragma interface
+
+#include <javax/swing/plaf/metal/MetalTheme.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+          class ColorUIResource;
+          class FontUIResource;
+        namespace metal
+        {
+            class DefaultMetalTheme;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::DefaultMetalTheme : public ::javax::swing::plaf::metal::MetalTheme
+{
+
+public:
+  DefaultMetalTheme();
+  virtual ::java::lang::String * getName();
+public: // actually protected
+  virtual ::javax::swing::plaf::ColorUIResource * getPrimary1();
+  virtual ::javax::swing::plaf::ColorUIResource * getPrimary2();
+  virtual ::javax::swing::plaf::ColorUIResource * getPrimary3();
+  virtual ::javax::swing::plaf::ColorUIResource * getSecondary1();
+  virtual ::javax::swing::plaf::ColorUIResource * getSecondary2();
+  virtual ::javax::swing::plaf::ColorUIResource * getSecondary3();
+public:
+  virtual ::javax::swing::plaf::FontUIResource * getControlTextFont();
+  virtual ::javax::swing::plaf::FontUIResource * getMenuTextFont();
+  virtual ::javax::swing::plaf::FontUIResource * getSubTextFont();
+  virtual ::javax::swing::plaf::FontUIResource * getSystemTextFont();
+  virtual ::javax::swing::plaf::FontUIResource * getUserTextFont();
+  virtual ::javax::swing::plaf::FontUIResource * getWindowTitleFont();
+private:
+  ::javax::swing::plaf::FontUIResource * getFont(jint);
+  jboolean isBoldMetal();
+  static ::javax::swing::plaf::ColorUIResource * PRIMARY1;
+  static ::javax::swing::plaf::ColorUIResource * PRIMARY2;
+  static ::javax::swing::plaf::ColorUIResource * PRIMARY3;
+  static ::javax::swing::plaf::ColorUIResource * SECONDARY1;
+  static ::javax::swing::plaf::ColorUIResource * SECONDARY2;
+  static ::javax::swing::plaf::ColorUIResource * SECONDARY3;
+  static ::javax::swing::plaf::FontUIResource * SUB_TEXT_FONT;
+  static ::javax::swing::plaf::FontUIResource * SYSTEM_TEXT_FONT;
+  static ::javax::swing::plaf::FontUIResource * USER_TEXT_FONT;
+  static ::javax::swing::plaf::FontUIResource * WINDOW_TITLE_FONT;
+  static ::javax::swing::plaf::FontUIResource * PLAIN_CONTROL_TEXT_FONT;
+  static ::javax::swing::plaf::FontUIResource * BOLD_CONTROL_TEXT_FONT;
+  static ::javax::swing::plaf::FontUIResource * PLAIN_MENU_TEXT_FONT;
+  static ::javax::swing::plaf::FontUIResource * BOLD_MENU_TEXT_FONT;
+public: // actually package-private
+  static const jint CONTROL_TEXT_FONT = 1;
+  static const jint MENU_TEXT_FONT = 2;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_DefaultMetalTheme__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$ButtonBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$ButtonBorder.h
new file mode 100644
index 000000000..23e18dadd
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalBorders$ButtonBorder.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalBorders$ButtonBorder__
+#define __javax_swing_plaf_metal_MetalBorders$ButtonBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalBorders$ButtonBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalBorders$ButtonBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  MetalBorders$ButtonBorder();
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+private:
+  void paintDefaultButtonBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  void paintOceanButtonBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+public:
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+public: // actually protected
+  static ::java::awt::Insets * borderInsets;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalBorders$ButtonBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$DesktopIconBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$DesktopIconBorder.h
new file mode 100644
index 000000000..ba3739cf6
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalBorders$DesktopIconBorder.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalBorders$DesktopIconBorder__
+#define __javax_swing_plaf_metal_MetalBorders$DesktopIconBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalBorders$DesktopIconBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalBorders$DesktopIconBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  MetalBorders$DesktopIconBorder();
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalBorders$DesktopIconBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$Flush3DBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$Flush3DBorder.h
new file mode 100644
index 000000000..be51edc5b
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalBorders$Flush3DBorder.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalBorders$Flush3DBorder__
+#define __javax_swing_plaf_metal_MetalBorders$Flush3DBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalBorders$Flush3DBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalBorders$Flush3DBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  MetalBorders$Flush3DBorder();
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+private:
+  static ::java::awt::Insets * borderInsets;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalBorders$Flush3DBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$InternalFrameBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$InternalFrameBorder.h
new file mode 100644
index 000000000..e85132fae
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalBorders$InternalFrameBorder.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalBorders$InternalFrameBorder__
+#define __javax_swing_plaf_metal_MetalBorders$InternalFrameBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalBorders$InternalFrameBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalBorders$InternalFrameBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  MetalBorders$InternalFrameBorder();
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+private:
+  static ::java::awt::Insets * borderInsets;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalBorders$InternalFrameBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$MenuBarBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$MenuBarBorder.h
new file mode 100644
index 000000000..b42e516e8
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalBorders$MenuBarBorder.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalBorders$MenuBarBorder__
+#define __javax_swing_plaf_metal_MetalBorders$MenuBarBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalBorders$MenuBarBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalBorders$MenuBarBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  MetalBorders$MenuBarBorder();
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+public: // actually protected
+  static ::java::awt::Insets * borderInsets;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalBorders$MenuBarBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$MenuItemBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$MenuItemBorder.h
new file mode 100644
index 000000000..b339b8758
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalBorders$MenuItemBorder.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalBorders$MenuItemBorder__
+#define __javax_swing_plaf_metal_MetalBorders$MenuItemBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalBorders$MenuItemBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalBorders$MenuItemBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  MetalBorders$MenuItemBorder();
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+public: // actually protected
+  static ::java::awt::Insets * borderInsets;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalBorders$MenuItemBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$OptionDialogBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$OptionDialogBorder.h
new file mode 100644
index 000000000..1a04e67ec
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalBorders$OptionDialogBorder.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalBorders$OptionDialogBorder__
+#define __javax_swing_plaf_metal_MetalBorders$OptionDialogBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalBorders$OptionDialogBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalBorders$OptionDialogBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  MetalBorders$OptionDialogBorder();
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalBorders$OptionDialogBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$PaletteBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$PaletteBorder.h
new file mode 100644
index 000000000..853bd4cef
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalBorders$PaletteBorder.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalBorders$PaletteBorder__
+#define __javax_swing_plaf_metal_MetalBorders$PaletteBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalBorders$PaletteBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalBorders$PaletteBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  MetalBorders$PaletteBorder();
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+private:
+  static ::java::awt::Insets * borderInsets;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalBorders$PaletteBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$PopupMenuBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$PopupMenuBorder.h
new file mode 100644
index 000000000..cc66966b6
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalBorders$PopupMenuBorder.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalBorders$PopupMenuBorder__
+#define __javax_swing_plaf_metal_MetalBorders$PopupMenuBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalBorders$PopupMenuBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalBorders$PopupMenuBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  MetalBorders$PopupMenuBorder();
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+public: // actually protected
+  static ::java::awt::Insets * borderInsets;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalBorders$PopupMenuBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$RolloverButtonBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$RolloverButtonBorder.h
new file mode 100644
index 000000000..e34c0cf37
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalBorders$RolloverButtonBorder.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalBorders$RolloverButtonBorder__
+#define __javax_swing_plaf_metal_MetalBorders$RolloverButtonBorder__
+
+#pragma interface
+
+#include <javax/swing/plaf/metal/MetalBorders$ButtonBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalBorders$RolloverButtonBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalBorders$RolloverButtonBorder : public ::javax::swing::plaf::metal::MetalBorders$ButtonBorder
+{
+
+public:
+  MetalBorders$RolloverButtonBorder();
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalBorders$RolloverButtonBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$RolloverMarginBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$RolloverMarginBorder.h
new file mode 100644
index 000000000..78e6c4f00
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalBorders$RolloverMarginBorder.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalBorders$RolloverMarginBorder__
+#define __javax_swing_plaf_metal_MetalBorders$RolloverMarginBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalBorders$RolloverMarginBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalBorders$RolloverMarginBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  MetalBorders$RolloverMarginBorder();
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+public: // actually protected
+  static ::java::awt::Insets * borderInsets;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalBorders$RolloverMarginBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$ScrollPaneBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$ScrollPaneBorder.h
new file mode 100644
index 000000000..d6baf2439
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalBorders$ScrollPaneBorder.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalBorders$ScrollPaneBorder__
+#define __javax_swing_plaf_metal_MetalBorders$ScrollPaneBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalBorders$ScrollPaneBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalBorders$ScrollPaneBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  MetalBorders$ScrollPaneBorder();
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+private:
+  static ::java::awt::Insets * insets;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalBorders$ScrollPaneBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$TableHeaderBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$TableHeaderBorder.h
new file mode 100644
index 000000000..948741191
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalBorders$TableHeaderBorder.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalBorders$TableHeaderBorder__
+#define __javax_swing_plaf_metal_MetalBorders$TableHeaderBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalBorders$TableHeaderBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalBorders$TableHeaderBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  MetalBorders$TableHeaderBorder();
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+public: // actually protected
+  ::java::awt::Insets * __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) editorBorderInsets;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalBorders$TableHeaderBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$TextFieldBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$TextFieldBorder.h
new file mode 100644
index 000000000..de1e4e7d8
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalBorders$TextFieldBorder.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalBorders$TextFieldBorder__
+#define __javax_swing_plaf_metal_MetalBorders$TextFieldBorder__
+
+#pragma interface
+
+#include <javax/swing/plaf/metal/MetalBorders$Flush3DBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalBorders$TextFieldBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalBorders$TextFieldBorder : public ::javax::swing::plaf::metal::MetalBorders$Flush3DBorder
+{
+
+public:
+  MetalBorders$TextFieldBorder();
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalBorders$TextFieldBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$ToggleButtonBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$ToggleButtonBorder.h
new file mode 100644
index 000000000..6d9f3de5c
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalBorders$ToggleButtonBorder.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalBorders$ToggleButtonBorder__
+#define __javax_swing_plaf_metal_MetalBorders$ToggleButtonBorder__
+
+#pragma interface
+
+#include <javax/swing/plaf/metal/MetalBorders$ButtonBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalBorders$ToggleButtonBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalBorders$ToggleButtonBorder : public ::javax::swing::plaf::metal::MetalBorders$ButtonBorder
+{
+
+public:
+  MetalBorders$ToggleButtonBorder();
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalBorders$ToggleButtonBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$ToolBarBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$ToolBarBorder.h
new file mode 100644
index 000000000..da97e79e5
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalBorders$ToolBarBorder.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalBorders$ToolBarBorder__
+#define __javax_swing_plaf_metal_MetalBorders$ToolBarBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalBorders$ToolBarBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalBorders$ToolBarBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  MetalBorders$ToolBarBorder();
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalBorders$ToolBarBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders.h b/libjava/javax/swing/plaf/metal/MetalBorders.h
new file mode 100644
index 000000000..63101bfb5
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalBorders.h
@@ -0,0 +1,62 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalBorders__
+#define __javax_swing_plaf_metal_MetalBorders__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace border
+      {
+          class Border;
+      }
+      namespace plaf
+      {
+        namespace basic
+        {
+            class BasicBorders$MarginBorder;
+        }
+        namespace metal
+        {
+            class MetalBorders;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalBorders : public ::java::lang::Object
+{
+
+public:
+  MetalBorders();
+  static ::javax::swing::border::Border * getButtonBorder();
+  static ::javax::swing::border::Border * getToggleButtonBorder();
+  static ::javax::swing::border::Border * getDesktopIconBorder();
+  static ::javax::swing::border::Border * getTextFieldBorder();
+  static ::javax::swing::border::Border * getTextBorder();
+public: // actually package-private
+  static ::javax::swing::border::Border * getToolbarButtonBorder();
+  static ::javax::swing::border::Border * getMarginBorder();
+  static ::javax::swing::border::Border * getRolloverBorder();
+private:
+  static ::javax::swing::border::Border * buttonBorder;
+  static ::javax::swing::border::Border * toggleButtonBorder;
+  static ::javax::swing::border::Border * desktopIconBorder;
+  static ::javax::swing::border::Border * toolbarButtonBorder;
+  static ::javax::swing::border::Border * textFieldBorder;
+  static ::javax::swing::border::Border * textBorder;
+  static ::javax::swing::border::Border * rolloverBorder;
+  static ::javax::swing::plaf::basic::BasicBorders$MarginBorder * marginBorder;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalBorders__
diff --git a/libjava/javax/swing/plaf/metal/MetalButtonListener.h b/libjava/javax/swing/plaf/metal/MetalButtonListener.h
new file mode 100644
index 000000000..0beeef171
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalButtonListener.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalButtonListener__
+#define __javax_swing_plaf_metal_MetalButtonListener__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicButtonListener.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class AbstractButton;
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalButtonListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalButtonListener : public ::javax::swing::plaf::basic::BasicButtonListener
+{
+
+public:
+  MetalButtonListener(::javax::swing::AbstractButton *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalButtonListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalButtonUI.h b/libjava/javax/swing/plaf/metal/MetalButtonUI.h
new file mode 100644
index 000000000..d2e6ced26
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalButtonUI.h
@@ -0,0 +1,71 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalButtonUI__
+#define __javax_swing_plaf_metal_MetalButtonUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicButtonUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Graphics;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class AbstractButton;
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalButtonUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalButtonUI : public ::javax::swing::plaf::basic::BasicButtonUI
+{
+
+public:
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  MetalButtonUI();
+public: // actually protected
+  virtual ::java::awt::Color * getFocusColor();
+  virtual ::java::awt::Color * getSelectColor();
+  virtual ::java::awt::Color * getDisabledTextColor();
+public:
+  virtual void installDefaults(::javax::swing::AbstractButton *);
+  virtual void uninstallDefaults(::javax::swing::AbstractButton *);
+public: // actually protected
+  virtual void paintButtonPressed(::java::awt::Graphics *, ::javax::swing::AbstractButton *);
+  virtual void paintFocus(::java::awt::Graphics *, ::javax::swing::AbstractButton *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, ::java::awt::Rectangle *);
+  virtual void paintText(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *, ::java::lang::String *);
+public:
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+private:
+  jboolean isToolbarButton(::java::awt::Component *);
+  jboolean isDrawingGradient(::java::lang::String *);
+  static ::javax::swing::plaf::metal::MetalButtonUI * sharedUI;
+public: // actually protected
+  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicButtonUI)))) focusColor;
+  ::java::awt::Color * selectColor;
+  ::java::awt::Color * disabledTextColor;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalButtonUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalCheckBoxIcon.h b/libjava/javax/swing/plaf/metal/MetalCheckBoxIcon.h
new file mode 100644
index 000000000..b30ae97ba
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalCheckBoxIcon.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalCheckBoxIcon__
+#define __javax_swing_plaf_metal_MetalCheckBoxIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalBorders$ButtonBorder;
+            class MetalCheckBoxIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalCheckBoxIcon : public ::java::lang::Object
+{
+
+public:
+  MetalCheckBoxIcon();
+public: // actually protected
+  virtual void drawCheck(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  virtual jint getControlSize();
+public:
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalBorders$ButtonBorder * __attribute__((aligned(__alignof__( ::java::lang::Object)))) border;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalCheckBoxIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalCheckBoxUI.h b/libjava/javax/swing/plaf/metal/MetalCheckBoxUI.h
new file mode 100644
index 000000000..fff6cd27e
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalCheckBoxUI.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalCheckBoxUI__
+#define __javax_swing_plaf_metal_MetalCheckBoxUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/metal/MetalRadioButtonUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalCheckBoxUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalCheckBoxUI : public ::javax::swing::plaf::metal::MetalRadioButtonUI
+{
+
+public:
+  MetalCheckBoxUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual ::java::lang::String * getPropertyPrefix();
+private:
+  static ::javax::swing::plaf::metal::MetalCheckBoxUI * instance;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalCheckBoxUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxButton.h b/libjava/javax/swing/plaf/metal/MetalComboBoxButton.h
new file mode 100644
index 000000000..000e755fb
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalComboBoxButton.h
@@ -0,0 +1,63 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalComboBoxButton__
+#define __javax_swing_plaf_metal_MetalComboBoxButton__
+
+#pragma interface
+
+#include <javax/swing/JButton.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class CellRendererPane;
+        class Icon;
+        class JComboBox;
+        class JList;
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalComboBoxButton;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalComboBoxButton : public ::javax::swing::JButton
+{
+
+public:
+  MetalComboBoxButton(::javax::swing::JComboBox *, ::javax::swing::Icon *, ::javax::swing::CellRendererPane *, ::javax::swing::JList *);
+  MetalComboBoxButton(::javax::swing::JComboBox *, ::javax::swing::Icon *, jboolean, ::javax::swing::CellRendererPane *, ::javax::swing::JList *);
+  virtual ::javax::swing::JComboBox * getComboBox();
+  virtual void setComboBox(::javax::swing::JComboBox *);
+  virtual ::javax::swing::Icon * getComboIcon();
+  virtual void setComboIcon(::javax::swing::Icon *);
+  virtual jboolean isIconOnly();
+  virtual void setIconOnly(jboolean);
+  virtual jboolean isFocusTraversable();
+  virtual void setEnabled(jboolean);
+  virtual void paintComponent(::java::awt::Graphics *);
+public: // actually protected
+  ::javax::swing::JComboBox * __attribute__((aligned(__alignof__( ::javax::swing::JButton)))) comboBox;
+  ::javax::swing::JList * listBox;
+  ::javax::swing::CellRendererPane * rendererPane;
+  ::javax::swing::Icon * comboIcon;
+  jboolean iconOnly;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalComboBoxButton__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxEditor$EditorTextField.h b/libjava/javax/swing/plaf/metal/MetalComboBoxEditor$EditorTextField.h
new file mode 100644
index 000000000..501e13864
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalComboBoxEditor$EditorTextField.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalComboBoxEditor$EditorTextField__
+#define __javax_swing_plaf_metal_MetalComboBoxEditor$EditorTextField__
+
+#pragma interface
+
+#include <javax/swing/JTextField.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalComboBoxEditor;
+            class MetalComboBoxEditor$EditorTextField;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalComboBoxEditor$EditorTextField : public ::javax::swing::JTextField
+{
+
+public: // actually package-private
+  MetalComboBoxEditor$EditorTextField(::javax::swing::plaf::metal::MetalComboBoxEditor *, ::java::lang::String *, jint);
+public:
+  virtual ::java::awt::Dimension * getPreferredSize();
+  virtual ::java::awt::Dimension * getMinimumSize();
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalComboBoxEditor * __attribute__((aligned(__alignof__( ::javax::swing::JTextField)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalComboBoxEditor$EditorTextField__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxEditor$MetalComboBoxEditorBorder.h b/libjava/javax/swing/plaf/metal/MetalComboBoxEditor$MetalComboBoxEditorBorder.h
new file mode 100644
index 000000000..4f8166c50
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalComboBoxEditor$MetalComboBoxEditorBorder.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalComboBoxEditor$MetalComboBoxEditorBorder__
+#define __javax_swing_plaf_metal_MetalComboBoxEditor$MetalComboBoxEditorBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalComboBoxEditor$MetalComboBoxEditorBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalComboBoxEditor$MetalComboBoxEditorBorder : public ::javax::swing::border::AbstractBorder
+{
+
+public:
+  MetalComboBoxEditor$MetalComboBoxEditorBorder();
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalComboBoxEditor$MetalComboBoxEditorBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxEditor$UIResource.h b/libjava/javax/swing/plaf/metal/MetalComboBoxEditor$UIResource.h
new file mode 100644
index 000000000..edf8097d4
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalComboBoxEditor$UIResource.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalComboBoxEditor$UIResource__
+#define __javax_swing_plaf_metal_MetalComboBoxEditor$UIResource__
+
+#pragma interface
+
+#include <javax/swing/plaf/metal/MetalComboBoxEditor.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalComboBoxEditor$UIResource;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalComboBoxEditor$UIResource : public ::javax::swing::plaf::metal::MetalComboBoxEditor
+{
+
+public:
+  MetalComboBoxEditor$UIResource();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalComboBoxEditor$UIResource__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxEditor.h b/libjava/javax/swing/plaf/metal/MetalComboBoxEditor.h
new file mode 100644
index 000000000..89d3edfe4
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalComboBoxEditor.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalComboBoxEditor__
+#define __javax_swing_plaf_metal_MetalComboBoxEditor__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicComboBoxEditor.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalComboBoxEditor;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalComboBoxEditor : public ::javax::swing::plaf::basic::BasicComboBoxEditor
+{
+
+public:
+  MetalComboBoxEditor();
+public: // actually protected
+  static ::java::awt::Insets * editorBorderInsets;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalComboBoxEditor__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxIcon.h b/libjava/javax/swing/plaf/metal/MetalComboBoxIcon.h
new file mode 100644
index 000000000..a51d9aa3c
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalComboBoxIcon.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalComboBoxIcon__
+#define __javax_swing_plaf_metal_MetalComboBoxIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalComboBoxIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalComboBoxIcon : public ::java::lang::Object
+{
+
+public:
+  MetalComboBoxIcon();
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalComboBoxIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxUI$MetalComboBoxLayoutManager.h b/libjava/javax/swing/plaf/metal/MetalComboBoxUI$MetalComboBoxLayoutManager.h
new file mode 100644
index 000000000..d2a909c44
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalComboBoxUI$MetalComboBoxLayoutManager.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalComboBoxUI$MetalComboBoxLayoutManager__
+#define __javax_swing_plaf_metal_MetalComboBoxUI$MetalComboBoxLayoutManager__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicComboBoxUI$ComboBoxLayoutManager.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Container;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalComboBoxUI;
+            class MetalComboBoxUI$MetalComboBoxLayoutManager;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalComboBoxUI$MetalComboBoxLayoutManager : public ::javax::swing::plaf::basic::BasicComboBoxUI$ComboBoxLayoutManager
+{
+
+public:
+  MetalComboBoxUI$MetalComboBoxLayoutManager(::javax::swing::plaf::metal::MetalComboBoxUI *);
+  virtual void layoutContainer(::java::awt::Container *);
+  virtual void superLayout(::java::awt::Container *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalComboBoxUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicComboBoxUI$ComboBoxLayoutManager)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalComboBoxUI$MetalComboBoxLayoutManager__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxUI$MetalComboPopup.h b/libjava/javax/swing/plaf/metal/MetalComboBoxUI$MetalComboPopup.h
new file mode 100644
index 000000000..ac9789ff0
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalComboBoxUI$MetalComboPopup.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalComboBoxUI$MetalComboPopup__
+#define __javax_swing_plaf_metal_MetalComboBoxUI$MetalComboPopup__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicComboPopup.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComboBox;
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalComboBoxUI;
+            class MetalComboBoxUI$MetalComboPopup;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalComboBoxUI$MetalComboPopup : public ::javax::swing::plaf::basic::BasicComboPopup
+{
+
+public:
+  MetalComboBoxUI$MetalComboPopup(::javax::swing::plaf::metal::MetalComboBoxUI *, ::javax::swing::JComboBox *);
+  virtual void delegateFocus(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalComboBoxUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicComboPopup)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalComboBoxUI$MetalComboPopup__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxUI$MetalPropertyChangeListener.h b/libjava/javax/swing/plaf/metal/MetalComboBoxUI$MetalPropertyChangeListener.h
new file mode 100644
index 000000000..fee1da1a4
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalComboBoxUI$MetalPropertyChangeListener.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalComboBoxUI$MetalPropertyChangeListener__
+#define __javax_swing_plaf_metal_MetalComboBoxUI$MetalPropertyChangeListener__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicComboBoxUI$PropertyChangeHandler.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalComboBoxUI;
+            class MetalComboBoxUI$MetalPropertyChangeListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalComboBoxUI$MetalPropertyChangeListener : public ::javax::swing::plaf::basic::BasicComboBoxUI$PropertyChangeHandler
+{
+
+public:
+  MetalComboBoxUI$MetalPropertyChangeListener(::javax::swing::plaf::metal::MetalComboBoxUI *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalComboBoxUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicComboBoxUI$PropertyChangeHandler)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalComboBoxUI$MetalPropertyChangeListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxUI.h b/libjava/javax/swing/plaf/metal/MetalComboBoxUI.h
new file mode 100644
index 000000000..047d1442b
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalComboBoxUI.h
@@ -0,0 +1,83 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalComboBoxUI__
+#define __javax_swing_plaf_metal_MetalComboBoxUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicComboBoxUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Container;
+        class Dimension;
+        class Graphics;
+        class LayoutManager;
+    }
+    namespace beans
+    {
+        class PropertyChangeEvent;
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ComboBoxEditor;
+        class JButton;
+        class JComboBox;
+        class JComponent;
+        class JList;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class ComboPopup;
+        }
+        namespace metal
+        {
+            class MetalComboBoxUI;
+            class MetalComboBoxUI$MetalComboBoxLayoutManager;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalComboBoxUI : public ::javax::swing::plaf::basic::BasicComboBoxUI
+{
+
+public:
+  MetalComboBoxUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::javax::swing::ComboBoxEditor * createEditor();
+  virtual ::javax::swing::plaf::basic::ComboPopup * createPopup();
+  virtual ::javax::swing::JButton * createArrowButton();
+public:
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+public: // actually protected
+  virtual void editablePropertyChanged(::java::beans::PropertyChangeEvent *);
+  virtual ::java::awt::LayoutManager * createLayoutManager();
+  virtual void removeListeners();
+public:
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual void configureEditor();
+  virtual void unconfigureEditor();
+  virtual void layoutComboBox(::java::awt::Container *, ::javax::swing::plaf::metal::MetalComboBoxUI$MetalComboBoxLayoutManager *);
+public: // actually package-private
+  static ::javax::swing::JButton * access$0(::javax::swing::plaf::metal::MetalComboBoxUI *);
+  static ::javax::swing::JComboBox * access$1(::javax::swing::plaf::metal::MetalComboBoxUI *);
+  static ::javax::swing::JList * access$2(::javax::swing::plaf::metal::MetalComboBoxUI *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalComboBoxUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalDesktopIconUI.h b/libjava/javax/swing/plaf/metal/MetalDesktopIconUI.h
new file mode 100644
index 000000000..1b1de7b57
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalDesktopIconUI.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalDesktopIconUI__
+#define __javax_swing_plaf_metal_MetalDesktopIconUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicDesktopIconUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalDesktopIconUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalDesktopIconUI : public ::javax::swing::plaf::basic::BasicDesktopIconUI
+{
+
+public:
+  MetalDesktopIconUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalDesktopIconUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$ButtonLayout.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$ButtonLayout.h
new file mode 100644
index 000000000..9900aed39
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$ButtonLayout.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$ButtonLayout__
+#define __javax_swing_plaf_metal_MetalFileChooserUI$ButtonLayout__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalFileChooserUI;
+            class MetalFileChooserUI$ButtonLayout;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI$ButtonLayout : public ::java::lang::Object
+{
+
+public: // actually package-private
+  MetalFileChooserUI$ButtonLayout(::javax::swing::plaf::metal::MetalFileChooserUI *);
+public:
+  virtual void layoutContainer(::java::awt::Container *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+  virtual void removeLayoutComponent(::java::awt::Component *);
+public: // actually package-private
+  static const jint GAP = 4;
+  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI$ButtonLayout__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DetailViewActionListener.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DetailViewActionListener.h
new file mode 100644
index 000000000..92fac4ca2
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DetailViewActionListener.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$DetailViewActionListener__
+#define __javax_swing_plaf_metal_MetalFileChooserUI$DetailViewActionListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalFileChooserUI;
+            class MetalFileChooserUI$DetailViewActionListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI$DetailViewActionListener : public ::java::lang::Object
+{
+
+public: // actually package-private
+  MetalFileChooserUI$DetailViewActionListener(::javax::swing::plaf::metal::MetalFileChooserUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI$DetailViewActionListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxAction.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxAction.h
new file mode 100644
index 000000000..da666e129
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxAction.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$DirectoryComboBoxAction__
+#define __javax_swing_plaf_metal_MetalFileChooserUI$DirectoryComboBoxAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalFileChooserUI;
+            class MetalFileChooserUI$DirectoryComboBoxAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI$DirectoryComboBoxAction : public ::javax::swing::AbstractAction
+{
+
+public: // actually protected
+  MetalFileChooserUI$DirectoryComboBoxAction(::javax::swing::plaf::metal::MetalFileChooserUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI$DirectoryComboBoxAction__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxModel.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxModel.h
new file mode 100644
index 000000000..27a72e053
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxModel.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$DirectoryComboBoxModel__
+#define __javax_swing_plaf_metal_MetalFileChooserUI$DirectoryComboBoxModel__
+
+#pragma interface
+
+#include <javax/swing/AbstractListModel.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalFileChooserUI;
+            class MetalFileChooserUI$DirectoryComboBoxModel;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI$DirectoryComboBoxModel : public ::javax::swing::AbstractListModel
+{
+
+public:
+  MetalFileChooserUI$DirectoryComboBoxModel(::javax::swing::plaf::metal::MetalFileChooserUI *);
+  virtual jint getSize();
+  virtual ::java::lang::Object * getElementAt(jint);
+  virtual jint getDepth(jint);
+  virtual ::java::lang::Object * getSelectedItem();
+  virtual void setSelectedItem(::java::lang::Object *);
+private:
+  ::java::util::List * __attribute__((aligned(__alignof__( ::javax::swing::AbstractListModel)))) items;
+  jint selectedIndex;
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalFileChooserUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI$DirectoryComboBoxModel__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxRenderer.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxRenderer.h
new file mode 100644
index 000000000..6e88691ae
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxRenderer.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$DirectoryComboBoxRenderer__
+#define __javax_swing_plaf_metal_MetalFileChooserUI$DirectoryComboBoxRenderer__
+
+#pragma interface
+
+#include <javax/swing/DefaultListCellRenderer.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JFileChooser;
+        class JList;
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalFileChooserUI;
+            class MetalFileChooserUI$DirectoryComboBoxRenderer;
+            class MetalFileChooserUI$IndentIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI$DirectoryComboBoxRenderer : public ::javax::swing::DefaultListCellRenderer
+{
+
+public:
+  MetalFileChooserUI$DirectoryComboBoxRenderer(::javax::swing::plaf::metal::MetalFileChooserUI *, ::javax::swing::JFileChooser *);
+  virtual ::java::awt::Component * getListCellRendererComponent(::javax::swing::JList *, ::java::lang::Object *, jint, jboolean, jboolean);
+private:
+  ::javax::swing::plaf::metal::MetalFileChooserUI$IndentIcon * __attribute__((aligned(__alignof__( ::javax::swing::DefaultListCellRenderer)))) indentIcon;
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalFileChooserUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI$DirectoryComboBoxRenderer__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$FileRenderer.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$FileRenderer.h
new file mode 100644
index 000000000..235c7c968
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$FileRenderer.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$FileRenderer__
+#define __javax_swing_plaf_metal_MetalFileChooserUI$FileRenderer__
+
+#pragma interface
+
+#include <javax/swing/DefaultListCellRenderer.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JList;
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalFileChooserUI;
+            class MetalFileChooserUI$FileRenderer;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI$FileRenderer : public ::javax::swing::DefaultListCellRenderer
+{
+
+public: // actually protected
+  MetalFileChooserUI$FileRenderer(::javax::swing::plaf::metal::MetalFileChooserUI *);
+public:
+  virtual ::java::awt::Component * getListCellRendererComponent(::javax::swing::JList *, ::java::lang::Object *, jint, jboolean, jboolean);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::DefaultListCellRenderer)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI$FileRenderer__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxModel.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxModel.h
new file mode 100644
index 000000000..48ce51fe1
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxModel.h
@@ -0,0 +1,62 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$FilterComboBoxModel__
+#define __javax_swing_plaf_metal_MetalFileChooserUI$FilterComboBoxModel__
+
+#pragma interface
+
+#include <javax/swing/AbstractListModel.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace filechooser
+      {
+          class FileFilter;
+      }
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalFileChooserUI;
+            class MetalFileChooserUI$FilterComboBoxModel;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI$FilterComboBoxModel : public ::javax::swing::AbstractListModel
+{
+
+public: // actually protected
+  MetalFileChooserUI$FilterComboBoxModel(::javax::swing::plaf::metal::MetalFileChooserUI *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+  virtual void setSelectedItem(::java::lang::Object *);
+  virtual ::java::lang::Object * getSelectedItem();
+  virtual jint getSize();
+  virtual ::java::lang::Object * getElementAt(jint);
+public: // actually protected
+  JArray< ::javax::swing::filechooser::FileFilter * > * __attribute__((aligned(__alignof__( ::javax::swing::AbstractListModel)))) filters;
+private:
+  ::java::lang::Object * selected;
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalFileChooserUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI$FilterComboBoxModel__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxRenderer.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxRenderer.h
new file mode 100644
index 000000000..60260fa49
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxRenderer.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$FilterComboBoxRenderer__
+#define __javax_swing_plaf_metal_MetalFileChooserUI$FilterComboBoxRenderer__
+
+#pragma interface
+
+#include <javax/swing/DefaultListCellRenderer.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JList;
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalFileChooserUI;
+            class MetalFileChooserUI$FilterComboBoxRenderer;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI$FilterComboBoxRenderer : public ::javax::swing::DefaultListCellRenderer
+{
+
+public:
+  MetalFileChooserUI$FilterComboBoxRenderer(::javax::swing::plaf::metal::MetalFileChooserUI *);
+  virtual ::java::awt::Component * getListCellRendererComponent(::javax::swing::JList *, ::java::lang::Object *, jint, jboolean, jboolean);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::DefaultListCellRenderer)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI$FilterComboBoxRenderer__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$IndentIcon.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$IndentIcon.h
new file mode 100644
index 000000000..c1b25f671
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$IndentIcon.h
@@ -0,0 +1,58 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$IndentIcon__
+#define __javax_swing_plaf_metal_MetalFileChooserUI$IndentIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalFileChooserUI;
+            class MetalFileChooserUI$IndentIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI$IndentIcon : public ::java::lang::Object
+{
+
+public: // actually package-private
+  MetalFileChooserUI$IndentIcon(::javax::swing::plaf::metal::MetalFileChooserUI *);
+  virtual void setIcon(::javax::swing::Icon *);
+  virtual void setDepth(jint);
+public:
+  virtual jint getIconHeight();
+  virtual jint getIconWidth();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+private:
+  static const jint INDENT = 10;
+  ::javax::swing::Icon * __attribute__((aligned(__alignof__( ::java::lang::Object)))) icon;
+  jint depth;
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalFileChooserUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI$IndentIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$ListViewActionListener.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$ListViewActionListener.h
new file mode 100644
index 000000000..79b8f71ef
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$ListViewActionListener.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$ListViewActionListener__
+#define __javax_swing_plaf_metal_MetalFileChooserUI$ListViewActionListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalFileChooserUI;
+            class MetalFileChooserUI$ListViewActionListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI$ListViewActionListener : public ::java::lang::Object
+{
+
+public: // actually package-private
+  MetalFileChooserUI$ListViewActionListener(::javax::swing::plaf::metal::MetalFileChooserUI *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI$ListViewActionListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$MetalFileChooserPropertyChangeListener.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$MetalFileChooserPropertyChangeListener.h
new file mode 100644
index 000000000..7c0368ca9
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$MetalFileChooserPropertyChangeListener.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$MetalFileChooserPropertyChangeListener__
+#define __javax_swing_plaf_metal_MetalFileChooserUI$MetalFileChooserPropertyChangeListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalFileChooserUI;
+            class MetalFileChooserUI$MetalFileChooserPropertyChangeListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI$MetalFileChooserPropertyChangeListener : public ::java::lang::Object
+{
+
+public:
+  MetalFileChooserUI$MetalFileChooserPropertyChangeListener(::javax::swing::plaf::metal::MetalFileChooserUI *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI$MetalFileChooserPropertyChangeListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$MetalFileChooserSelectionListener.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$MetalFileChooserSelectionListener.h
new file mode 100644
index 000000000..460f121b9
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$MetalFileChooserSelectionListener.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$MetalFileChooserSelectionListener__
+#define __javax_swing_plaf_metal_MetalFileChooserUI$MetalFileChooserSelectionListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ListSelectionEvent;
+      }
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalFileChooserUI;
+            class MetalFileChooserUI$MetalFileChooserSelectionListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI$MetalFileChooserSelectionListener : public ::java::lang::Object
+{
+
+public: // actually protected
+  MetalFileChooserUI$MetalFileChooserSelectionListener(::javax::swing::plaf::metal::MetalFileChooserUI *);
+public:
+  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI$MetalFileChooserSelectionListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$SingleClickListener$EditingActionListener.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$SingleClickListener$EditingActionListener.h
new file mode 100644
index 000000000..02fe27e49
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$SingleClickListener$EditingActionListener.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$SingleClickListener$EditingActionListener__
+#define __javax_swing_plaf_metal_MetalFileChooserUI$SingleClickListener$EditingActionListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalFileChooserUI$SingleClickListener;
+            class MetalFileChooserUI$SingleClickListener$EditingActionListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI$SingleClickListener$EditingActionListener : public ::java::lang::Object
+{
+
+public: // actually package-private
+  MetalFileChooserUI$SingleClickListener$EditingActionListener(::javax::swing::plaf::metal::MetalFileChooserUI$SingleClickListener *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalFileChooserUI$SingleClickListener * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI$SingleClickListener$EditingActionListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$SingleClickListener.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$SingleClickListener.h
new file mode 100644
index 000000000..66c7b0d10
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$SingleClickListener.h
@@ -0,0 +1,60 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$SingleClickListener__
+#define __javax_swing_plaf_metal_MetalFileChooserUI$SingleClickListener__
+
+#pragma interface
+
+#include <java/awt/event/MouseAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JFileChooser;
+        class JList;
+        class JTextField;
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalFileChooserUI;
+            class MetalFileChooserUI$SingleClickListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI$SingleClickListener : public ::java::awt::event::MouseAdapter
+{
+
+public:
+  MetalFileChooserUI$SingleClickListener(::javax::swing::plaf::metal::MetalFileChooserUI *, ::javax::swing::JList *);
+  virtual void mouseClicked(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  virtual void editFile(jint);
+  virtual void completeEditing();
+  ::javax::swing::JList * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) list;
+  ::java::io::File * editFile__;
+  ::javax::swing::JFileChooser * fc;
+  ::java::lang::Object * lastSelected;
+  ::javax::swing::JTextField * editField;
+  ::javax::swing::plaf::metal::MetalFileChooserUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI$SingleClickListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$TableClickListener$EditingActionListener.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$TableClickListener$EditingActionListener.h
new file mode 100644
index 000000000..bacd2d07e
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$TableClickListener$EditingActionListener.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$TableClickListener$EditingActionListener__
+#define __javax_swing_plaf_metal_MetalFileChooserUI$TableClickListener$EditingActionListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalFileChooserUI$TableClickListener;
+            class MetalFileChooserUI$TableClickListener$EditingActionListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI$TableClickListener$EditingActionListener : public ::java::lang::Object
+{
+
+public: // actually package-private
+  MetalFileChooserUI$TableClickListener$EditingActionListener(::javax::swing::plaf::metal::MetalFileChooserUI$TableClickListener *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalFileChooserUI$TableClickListener * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI$TableClickListener$EditingActionListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$TableClickListener.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$TableClickListener.h
new file mode 100644
index 000000000..2e536e456
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$TableClickListener.h
@@ -0,0 +1,63 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$TableClickListener__
+#define __javax_swing_plaf_metal_MetalFileChooserUI$TableClickListener__
+
+#pragma interface
+
+#include <java/awt/event/MouseAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JFileChooser;
+        class JTable;
+        class JTextField;
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalFileChooserUI;
+            class MetalFileChooserUI$TableClickListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI$TableClickListener : public ::java::awt::event::MouseAdapter
+{
+
+public:
+  MetalFileChooserUI$TableClickListener(::javax::swing::plaf::metal::MetalFileChooserUI *, ::javax::swing::JTable *, ::javax::swing::JFileChooser *);
+  virtual void mouseClicked(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  virtual void editFile(jint);
+  virtual void completeEditing();
+public:
+  virtual void closeDialog();
+public: // actually package-private
+  ::javax::swing::JTable * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) table;
+  ::javax::swing::JFileChooser * fc;
+  ::java::lang::Object * lastSelected;
+  ::java::io::File * editFile__;
+  ::javax::swing::JTextField * editField;
+  ::javax::swing::plaf::metal::MetalFileChooserUI * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI$TableClickListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$TableFileRenderer.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$TableFileRenderer.h
new file mode 100644
index 000000000..e5b5029f7
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$TableFileRenderer.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$TableFileRenderer__
+#define __javax_swing_plaf_metal_MetalFileChooserUI$TableFileRenderer__
+
+#pragma interface
+
+#include <javax/swing/table/DefaultTableCellRenderer.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JTable;
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalFileChooserUI;
+            class MetalFileChooserUI$TableFileRenderer;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI$TableFileRenderer : public ::javax::swing::table::DefaultTableCellRenderer
+{
+
+public:
+  MetalFileChooserUI$TableFileRenderer(::javax::swing::plaf::metal::MetalFileChooserUI *);
+  virtual ::java::awt::Component * getTableCellRendererComponent(::javax::swing::JTable *, ::java::lang::Object *, jboolean, jboolean, jint, jint);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::table::DefaultTableCellRenderer)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI$TableFileRenderer__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$VerticalMidLayout.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$VerticalMidLayout.h
new file mode 100644
index 000000000..64f4be6c6
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$VerticalMidLayout.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$VerticalMidLayout__
+#define __javax_swing_plaf_metal_MetalFileChooserUI$VerticalMidLayout__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalFileChooserUI;
+            class MetalFileChooserUI$VerticalMidLayout;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI$VerticalMidLayout : public ::java::lang::Object
+{
+
+public: // actually package-private
+  MetalFileChooserUI$VerticalMidLayout(::javax::swing::plaf::metal::MetalFileChooserUI *);
+public:
+  virtual void layoutContainer(::java::awt::Container *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+  virtual void removeLayoutComponent(::java::awt::Component *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI$VerticalMidLayout__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI.h
new file mode 100644
index 000000000..cf8ceae94
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalFileChooserUI.h
@@ -0,0 +1,159 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalFileChooserUI__
+#define __javax_swing_plaf_metal_MetalFileChooserUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicFileChooserUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+      namespace event
+      {
+          class MouseListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ActionMap;
+        class JButton;
+        class JComboBox;
+        class JComponent;
+        class JFileChooser;
+        class JLabel;
+        class JList;
+        class JPanel;
+        class JScrollPane;
+        class JTable;
+        class JTextField;
+      namespace event
+      {
+          class ListSelectionEvent;
+          class ListSelectionListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalFileChooserUI;
+            class MetalFileChooserUI$DirectoryComboBoxModel;
+            class MetalFileChooserUI$DirectoryComboBoxRenderer;
+            class MetalFileChooserUI$FilterComboBoxModel;
+            class MetalFileChooserUI$FilterComboBoxRenderer;
+            class MetalFileChooserUI$SingleClickListener;
+            class MetalFileChooserUI$TableClickListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalFileChooserUI : public ::javax::swing::plaf::basic::BasicFileChooserUI
+{
+
+public:
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  MetalFileChooserUI(::javax::swing::JFileChooser *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual void installComponents(::javax::swing::JFileChooser *);
+  virtual void uninstallComponents(::javax::swing::JFileChooser *);
+public: // actually protected
+  virtual ::javax::swing::JPanel * getButtonPanel();
+  virtual ::javax::swing::JPanel * getBottomPanel();
+  virtual void installStrings(::javax::swing::JFileChooser *);
+  virtual void installListeners(::javax::swing::JFileChooser *);
+  virtual void uninstallListeners(::javax::swing::JFileChooser *);
+  virtual ::javax::swing::ActionMap * getActionMap();
+  virtual ::javax::swing::ActionMap * createActionMap();
+  virtual ::javax::swing::JPanel * createList(::javax::swing::JFileChooser *);
+  virtual ::javax::swing::JPanel * createDetailsView(::javax::swing::JFileChooser *);
+public: // actually package-private
+  virtual ::javax::swing::JPanel * updateTable();
+private:
+  ::java::lang::String * formatSize(jlong);
+public:
+  virtual ::javax::swing::event::ListSelectionListener * createListSelectionListener(::javax::swing::JFileChooser *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener(::javax::swing::JFileChooser *);
+public: // actually protected
+  virtual ::javax::swing::plaf::metal::MetalFileChooserUI$DirectoryComboBoxModel * createDirectoryComboBoxModel(::javax::swing::JFileChooser *);
+  virtual ::javax::swing::plaf::metal::MetalFileChooserUI$DirectoryComboBoxRenderer * createDirectoryComboBoxRenderer(::javax::swing::JFileChooser *);
+  virtual ::javax::swing::plaf::metal::MetalFileChooserUI$FilterComboBoxModel * createFilterComboBoxModel();
+  virtual ::javax::swing::plaf::metal::MetalFileChooserUI$FilterComboBoxRenderer * createFilterComboBoxRenderer();
+  virtual void addControlButtons();
+  virtual void removeControlButtons();
+public:
+  virtual void rescanCurrentDirectory(::javax::swing::JFileChooser *);
+  virtual ::java::lang::String * getFileName();
+  virtual void setFileName(::java::lang::String *);
+  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *);
+public: // actually protected
+  virtual ::javax::swing::JButton * getApproveButton(::javax::swing::JFileChooser *);
+public: // actually package-private
+  static void access$0(::javax::swing::plaf::metal::MetalFileChooserUI *, ::java::lang::String *);
+  static ::java::lang::String * access$1(::javax::swing::plaf::metal::MetalFileChooserUI *);
+  static ::java::lang::String * access$2(::javax::swing::plaf::metal::MetalFileChooserUI *);
+  static ::java::lang::String * access$3(::javax::swing::plaf::metal::MetalFileChooserUI *);
+  static ::java::lang::String * access$4(::javax::swing::plaf::metal::MetalFileChooserUI *);
+  static ::java::lang::String * access$5(::javax::swing::plaf::metal::MetalFileChooserUI *);
+  static void access$6(::javax::swing::plaf::metal::MetalFileChooserUI *, jboolean);
+  static void access$7(::javax::swing::plaf::metal::MetalFileChooserUI *, ::java::io::File *);
+  static ::javax::swing::plaf::metal::MetalFileChooserUI$FilterComboBoxModel * access$8(::javax::swing::plaf::metal::MetalFileChooserUI *);
+  static ::javax::swing::JButton * access$9(::javax::swing::plaf::metal::MetalFileChooserUI *);
+  static ::javax::swing::JPanel * access$10(::javax::swing::plaf::metal::MetalFileChooserUI *);
+  static ::javax::swing::JPanel * access$11(::javax::swing::plaf::metal::MetalFileChooserUI *);
+private:
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicFileChooserUI)))) directoryLabel;
+  ::javax::swing::JComboBox * directoryComboBox;
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalFileChooserUI$DirectoryComboBoxModel * directoryModel;
+private:
+  ::java::lang::String * fileLabel;
+  ::javax::swing::JTextField * fileTextField;
+  ::java::lang::String * filterLabel;
+  ::javax::swing::JPanel * topPanel;
+  ::javax::swing::JPanel * controls;
+  ::javax::swing::JPanel * bottomPanel;
+  ::javax::swing::JPanel * buttonPanel;
+  ::javax::swing::JButton * approveButton;
+public: // actually package-private
+  ::javax::swing::JList * fileList;
+  ::javax::swing::JTable * fileTable;
+  ::javax::swing::JPanel * fileListPanel;
+  ::javax::swing::JPanel * fileTablePanel;
+private:
+  ::javax::swing::plaf::metal::MetalFileChooserUI$FilterComboBoxModel * filterModel;
+  ::javax::swing::ActionMap * actionMap;
+public: // actually package-private
+  jboolean listView;
+  jboolean startEditing;
+  ::javax::swing::JScrollPane * scrollPane;
+  ::java::lang::String * save;
+  ::java::lang::String * look;
+  ::javax::swing::JLabel * dirLabel;
+  ::javax::swing::event::ListSelectionListener * listSelList;
+  ::java::awt::event::MouseListener * doubleClickList;
+  ::javax::swing::plaf::metal::MetalFileChooserUI$SingleClickListener * singleClickList;
+  ::javax::swing::plaf::metal::MetalFileChooserUI$TableClickListener * tableClickList;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalFileChooserUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$1.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$1.h
new file mode 100644
index 000000000..00054bddf
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$1.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$1__
+#define __javax_swing_plaf_metal_MetalIconFactory$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  MetalIconFactory$1();
+public:
+  virtual jint getIconHeight();
+  virtual jint getIconWidth();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$1__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$2.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$2.h
new file mode 100644
index 000000000..e969158f0
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$2.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$2__
+#define __javax_swing_plaf_metal_MetalIconFactory$2__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$2;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$2 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  MetalIconFactory$2();
+public:
+  virtual jint getIconHeight();
+  virtual jint getIconWidth();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$2__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$3.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$3.h
new file mode 100644
index 000000000..ca03fe0c6
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$3.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$3__
+#define __javax_swing_plaf_metal_MetalIconFactory$3__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$3;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$3 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  MetalIconFactory$3();
+public:
+  virtual jint getIconHeight();
+  virtual jint getIconWidth();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$3__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$CheckBoxMenuItemIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$CheckBoxMenuItemIcon.h
new file mode 100644
index 000000000..0625a9b24
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$CheckBoxMenuItemIcon.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$CheckBoxMenuItemIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$CheckBoxMenuItemIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$CheckBoxMenuItemIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$CheckBoxMenuItemIcon : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$CheckBoxMenuItemIcon();
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$CheckBoxMenuItemIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserDetailViewIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserDetailViewIcon.h
new file mode 100644
index 000000000..67b065fb4
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserDetailViewIcon.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$FileChooserDetailViewIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$FileChooserDetailViewIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$FileChooserDetailViewIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$FileChooserDetailViewIcon : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$FileChooserDetailViewIcon();
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$FileChooserDetailViewIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserHomeFolderIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserHomeFolderIcon.h
new file mode 100644
index 000000000..5395249ab
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserHomeFolderIcon.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$FileChooserHomeFolderIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$FileChooserHomeFolderIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$FileChooserHomeFolderIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$FileChooserHomeFolderIcon : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$FileChooserHomeFolderIcon();
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$FileChooserHomeFolderIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserListViewIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserListViewIcon.h
new file mode 100644
index 000000000..d1e479a83
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserListViewIcon.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$FileChooserListViewIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$FileChooserListViewIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$FileChooserListViewIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$FileChooserListViewIcon : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$FileChooserListViewIcon();
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$FileChooserListViewIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserNewFolderIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserNewFolderIcon.h
new file mode 100644
index 000000000..f34373e95
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserNewFolderIcon.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$FileChooserNewFolderIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$FileChooserNewFolderIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$FileChooserNewFolderIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$FileChooserNewFolderIcon : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$FileChooserNewFolderIcon();
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$FileChooserNewFolderIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserUpFolderIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserUpFolderIcon.h
new file mode 100644
index 000000000..ad83e2623
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserUpFolderIcon.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$FileChooserUpFolderIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$FileChooserUpFolderIcon__
+
+#pragma interface
+
+#include <javax/swing/plaf/metal/MetalIconFactory$FileChooserNewFolderIcon.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$FileChooserUpFolderIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$FileChooserUpFolderIcon : public ::javax::swing::plaf::metal::MetalIconFactory$FileChooserNewFolderIcon
+{
+
+public:
+  MetalIconFactory$FileChooserUpFolderIcon();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$FileChooserUpFolderIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$FileIcon16.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$FileIcon16.h
new file mode 100644
index 000000000..90f451b91
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$FileIcon16.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$FileIcon16__
+#define __javax_swing_plaf_metal_MetalIconFactory$FileIcon16__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$FileIcon16;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$FileIcon16 : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$FileIcon16();
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  virtual jint getAdditionalHeight();
+  virtual jint getShift();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$FileIcon16__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$FolderIcon16.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$FolderIcon16.h
new file mode 100644
index 000000000..80ed1ebdd
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$FolderIcon16.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$FolderIcon16__
+#define __javax_swing_plaf_metal_MetalIconFactory$FolderIcon16__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$FolderIcon16;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$FolderIcon16 : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$FolderIcon16();
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  virtual jint getAdditionalHeight();
+  virtual jint getShift();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$FolderIcon16__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$HorizontalSliderThumbIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$HorizontalSliderThumbIcon.h
new file mode 100644
index 000000000..cf726d87d
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$HorizontalSliderThumbIcon.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$HorizontalSliderThumbIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$HorizontalSliderThumbIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$HorizontalSliderThumbIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$HorizontalSliderThumbIcon : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$HorizontalSliderThumbIcon();
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+public: // actually package-private
+  JArray< JArray< jint > * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) gradientMask;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$HorizontalSliderThumbIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameAltMaximizeIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameAltMaximizeIcon.h
new file mode 100644
index 000000000..07a8d256a
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameAltMaximizeIcon.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$InternalFrameAltMaximizeIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$InternalFrameAltMaximizeIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$InternalFrameAltMaximizeIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$InternalFrameAltMaximizeIcon : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$InternalFrameAltMaximizeIcon(jint);
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+private:
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) size;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$InternalFrameAltMaximizeIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameCloseIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameCloseIcon.h
new file mode 100644
index 000000000..30289db5c
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameCloseIcon.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$InternalFrameCloseIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$InternalFrameCloseIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$InternalFrameCloseIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$InternalFrameCloseIcon : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$InternalFrameCloseIcon(jint);
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+private:
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) size;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$InternalFrameCloseIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameDefaultMenuIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameDefaultMenuIcon.h
new file mode 100644
index 000000000..0c111ca03
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameDefaultMenuIcon.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$InternalFrameDefaultMenuIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$InternalFrameDefaultMenuIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$InternalFrameDefaultMenuIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$InternalFrameDefaultMenuIcon : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$InternalFrameDefaultMenuIcon();
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$InternalFrameDefaultMenuIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameMaximizeIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameMaximizeIcon.h
new file mode 100644
index 000000000..95014b00c
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameMaximizeIcon.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$InternalFrameMaximizeIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$InternalFrameMaximizeIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$InternalFrameMaximizeIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$InternalFrameMaximizeIcon : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$InternalFrameMaximizeIcon();
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$InternalFrameMaximizeIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameMinimizeIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameMinimizeIcon.h
new file mode 100644
index 000000000..122d02828
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameMinimizeIcon.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$InternalFrameMinimizeIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$InternalFrameMinimizeIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$InternalFrameMinimizeIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$InternalFrameMinimizeIcon : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$InternalFrameMinimizeIcon();
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$InternalFrameMinimizeIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$PaletteCloseIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$PaletteCloseIcon.h
new file mode 100644
index 000000000..11ee59a15
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$PaletteCloseIcon.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$PaletteCloseIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$PaletteCloseIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$PaletteCloseIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$PaletteCloseIcon : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$PaletteCloseIcon();
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$PaletteCloseIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$RadioButtonIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$RadioButtonIcon.h
new file mode 100644
index 000000000..8d7eb638a
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$RadioButtonIcon.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$RadioButtonIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$RadioButtonIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$RadioButtonIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$RadioButtonIcon : public ::java::lang::Object
+{
+
+public: // actually package-private
+  MetalIconFactory$RadioButtonIcon();
+public:
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+private:
+  static JArray< JArray< jint > * > * gradientMask;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$RadioButtonIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$RadioButtonMenuItemIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$RadioButtonMenuItemIcon.h
new file mode 100644
index 000000000..4d0e722ad
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$RadioButtonMenuItemIcon.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$RadioButtonMenuItemIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$RadioButtonMenuItemIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$RadioButtonMenuItemIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$RadioButtonMenuItemIcon : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$RadioButtonMenuItemIcon();
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$RadioButtonMenuItemIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeComputerIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeComputerIcon.h
new file mode 100644
index 000000000..f46979882
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeComputerIcon.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$TreeComputerIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$TreeComputerIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$TreeComputerIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$TreeComputerIcon : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$TreeComputerIcon();
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$TreeComputerIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeControlIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeControlIcon.h
new file mode 100644
index 000000000..c0e9716dc
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeControlIcon.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$TreeControlIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$TreeControlIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$TreeControlIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$TreeControlIcon : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$TreeControlIcon(jboolean);
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  virtual void paintMe(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+public: // actually protected
+  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) isLight;
+private:
+  jboolean collapsed;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$TreeControlIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeFloppyDriveIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeFloppyDriveIcon.h
new file mode 100644
index 000000000..ad69d2d49
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeFloppyDriveIcon.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$TreeFloppyDriveIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$TreeFloppyDriveIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$TreeFloppyDriveIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$TreeFloppyDriveIcon : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$TreeFloppyDriveIcon();
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$TreeFloppyDriveIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeFolderIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeFolderIcon.h
new file mode 100644
index 000000000..4993efdb2
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeFolderIcon.h
@@ -0,0 +1,37 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$TreeFolderIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$TreeFolderIcon__
+
+#pragma interface
+
+#include <javax/swing/plaf/metal/MetalIconFactory$FolderIcon16.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$TreeFolderIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$TreeFolderIcon : public ::javax::swing::plaf::metal::MetalIconFactory$FolderIcon16
+{
+
+public:
+  MetalIconFactory$TreeFolderIcon();
+  virtual jint getAdditionalHeight();
+  virtual jint getShift();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$TreeFolderIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeHardDriveIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeHardDriveIcon.h
new file mode 100644
index 000000000..1eb1d5143
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeHardDriveIcon.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$TreeHardDriveIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$TreeHardDriveIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$TreeHardDriveIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$TreeHardDriveIcon : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$TreeHardDriveIcon();
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$TreeHardDriveIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeLeafIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeLeafIcon.h
new file mode 100644
index 000000000..df2b8e8da
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeLeafIcon.h
@@ -0,0 +1,37 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$TreeLeafIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$TreeLeafIcon__
+
+#pragma interface
+
+#include <javax/swing/plaf/metal/MetalIconFactory$FileIcon16.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$TreeLeafIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$TreeLeafIcon : public ::javax::swing::plaf::metal::MetalIconFactory$FileIcon16
+{
+
+public:
+  MetalIconFactory$TreeLeafIcon();
+  virtual jint getAdditionalHeight();
+  virtual jint getShift();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$TreeLeafIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$VerticalSliderThumbIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$VerticalSliderThumbIcon.h
new file mode 100644
index 000000000..7618da789
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory$VerticalSliderThumbIcon.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory$VerticalSliderThumbIcon__
+#define __javax_swing_plaf_metal_MetalIconFactory$VerticalSliderThumbIcon__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory$VerticalSliderThumbIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory$VerticalSliderThumbIcon : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory$VerticalSliderThumbIcon();
+  virtual jint getIconWidth();
+  virtual jint getIconHeight();
+  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
+public: // actually package-private
+  JArray< JArray< jint > * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) gradientMask;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory$VerticalSliderThumbIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory.h b/libjava/javax/swing/plaf/metal/MetalIconFactory.h
new file mode 100644
index 000000000..f1cb1d77e
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalIconFactory.h
@@ -0,0 +1,83 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalIconFactory__
+#define __javax_swing_plaf_metal_MetalIconFactory__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalIconFactory;
+            class MetalIconFactory$RadioButtonIcon;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalIconFactory : public ::java::lang::Object
+{
+
+public:
+  MetalIconFactory();
+  static ::javax::swing::Icon * getCheckBoxIcon();
+  static ::javax::swing::Icon * getCheckBoxMenuItemIcon();
+  static ::javax::swing::Icon * getFileChooserDetailViewIcon();
+  static ::javax::swing::Icon * getFileChooserHomeFolderIcon();
+  static ::javax::swing::Icon * getFileChooserListViewIcon();
+  static ::javax::swing::Icon * getFileChooserNewFolderIcon();
+  static ::javax::swing::Icon * getFileChooserUpFolderIcon();
+  static ::javax::swing::Icon * getRadioButtonIcon();
+  static ::javax::swing::Icon * getRadioButtonMenuItemIcon();
+  static ::javax::swing::Icon * getHorizontalSliderThumbIcon();
+  static ::javax::swing::Icon * getInternalFrameCloseIcon(jint);
+  static ::javax::swing::Icon * getInternalFrameDefaultMenuIcon();
+  static ::javax::swing::Icon * getInternalFrameMaximizeIcon(jint);
+  static ::javax::swing::Icon * getInternalFrameMinimizeIcon(jint);
+  static ::javax::swing::Icon * getInternalFrameAltMaximizeIcon(jint);
+  static ::javax::swing::Icon * getVerticalSliderThumbIcon();
+  static ::javax::swing::Icon * getTreeFolderIcon();
+  static ::javax::swing::Icon * getTreeLeafIcon();
+  static ::javax::swing::Icon * getTreeControlIcon(jboolean);
+  static ::javax::swing::Icon * getTreeComputerIcon();
+  static ::javax::swing::Icon * getTreeFloppyDriveIcon();
+  static ::javax::swing::Icon * getTreeHardDriveIcon();
+  static ::javax::swing::Icon * getMenuArrowIcon();
+  static ::javax::swing::Icon * getMenuItemArrowIcon();
+  static ::javax::swing::Icon * getMenuItemCheckIcon();
+  static const jboolean DARK = 0;
+  static const jboolean LIGHT = 1;
+private:
+  static ::javax::swing::Icon * menuArrow;
+  static ::javax::swing::Icon * menuItemArrow;
+  static ::javax::swing::Icon * checkBoxIcon;
+  static ::javax::swing::Icon * checkBoxMenuItemIcon;
+  static ::javax::swing::Icon * fileChooserDetailViewIcon;
+  static ::javax::swing::Icon * fileChooserHomeFolderIcon;
+  static ::javax::swing::Icon * fileChooserListViewIcon;
+  static ::javax::swing::Icon * fileChooserNewFolderIcon;
+  static ::javax::swing::Icon * fileChooserUpFolderIcon;
+  static ::javax::swing::plaf::metal::MetalIconFactory$RadioButtonIcon * radioButtonIcon;
+  static ::javax::swing::Icon * radioButtonMenuItemIcon;
+  static ::javax::swing::Icon * internalFrameDefaultMenuIcon;
+  static ::javax::swing::Icon * treeComputerIcon;
+  static ::javax::swing::Icon * treeFloppyDriveIcon;
+  static ::javax::swing::Icon * treeHardDriveIcon;
+  static ::javax::swing::Icon * horizontalSliderThumbIcon;
+  static ::javax::swing::Icon * verticalSliderThumbIcon;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalIconFactory__
diff --git a/libjava/javax/swing/plaf/metal/MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler.h b/libjava/javax/swing/plaf/metal/MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler.h
new file mode 100644
index 000000000..ba5668823
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler__
+#define __javax_swing_plaf_metal_MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicInternalFrameTitlePane$PropertyChangeHandler.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalInternalFrameTitlePane;
+            class MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler : public ::javax::swing::plaf::basic::BasicInternalFrameTitlePane$PropertyChangeHandler
+{
+
+public:
+  MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler(::javax::swing::plaf::metal::MetalInternalFrameTitlePane *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicInternalFrameTitlePane$PropertyChangeHandler)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/metal/MetalInternalFrameTitlePane$MetalTitlePaneLayout.h b/libjava/javax/swing/plaf/metal/MetalInternalFrameTitlePane$MetalTitlePaneLayout.h
new file mode 100644
index 000000000..da7e76cb7
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalInternalFrameTitlePane$MetalTitlePaneLayout.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalInternalFrameTitlePane$MetalTitlePaneLayout__
+#define __javax_swing_plaf_metal_MetalInternalFrameTitlePane$MetalTitlePaneLayout__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalInternalFrameTitlePane;
+            class MetalInternalFrameTitlePane$MetalTitlePaneLayout;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalInternalFrameTitlePane$MetalTitlePaneLayout : public ::java::lang::Object
+{
+
+public:
+  MetalInternalFrameTitlePane$MetalTitlePaneLayout(::javax::swing::plaf::metal::MetalInternalFrameTitlePane *);
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+  virtual void layoutContainer(::java::awt::Container *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  virtual void removeLayoutComponent(::java::awt::Component *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalInternalFrameTitlePane$MetalTitlePaneLayout__
diff --git a/libjava/javax/swing/plaf/metal/MetalInternalFrameTitlePane.h b/libjava/javax/swing/plaf/metal/MetalInternalFrameTitlePane.h
new file mode 100644
index 000000000..f3c0e7fab
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalInternalFrameTitlePane.h
@@ -0,0 +1,81 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalInternalFrameTitlePane__
+#define __javax_swing_plaf_metal_MetalInternalFrameTitlePane__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicInternalFrameTitlePane.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+        class LayoutManager;
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+        class JButton;
+        class JInternalFrame;
+        class JLabel;
+        class JMenu;
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalInternalFrameTitlePane;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalInternalFrameTitlePane : public ::javax::swing::plaf::basic::BasicInternalFrameTitlePane
+{
+
+public:
+  MetalInternalFrameTitlePane(::javax::swing::JInternalFrame *);
+public: // actually protected
+  virtual void installDefaults();
+  virtual void uninstallDefaults();
+  virtual void createButtons();
+  virtual void addSystemMenuItems(::javax::swing::JMenu *);
+  virtual void showSystemMenu();
+  virtual void addSubComponents();
+  virtual ::java::awt::LayoutManager * createLayout();
+public:
+  virtual void paintPalette(::java::awt::Graphics *);
+  virtual void paintComponent(::java::awt::Graphics *);
+  virtual void setPalette(jboolean);
+public: // actually protected
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
+public: // actually package-private
+  static ::javax::swing::JInternalFrame * access$0(::javax::swing::plaf::metal::MetalInternalFrameTitlePane *);
+  static ::javax::swing::JButton * access$1(::javax::swing::plaf::metal::MetalInternalFrameTitlePane *);
+  static ::javax::swing::Icon * access$2(::javax::swing::plaf::metal::MetalInternalFrameTitlePane *);
+  static ::javax::swing::JButton * access$3(::javax::swing::plaf::metal::MetalInternalFrameTitlePane *);
+  static ::javax::swing::Icon * access$4(::javax::swing::plaf::metal::MetalInternalFrameTitlePane *);
+  static ::javax::swing::JButton * access$5(::javax::swing::plaf::metal::MetalInternalFrameTitlePane *);
+  static ::javax::swing::Icon * access$6(::javax::swing::plaf::metal::MetalInternalFrameTitlePane *);
+public: // actually protected
+  jboolean __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicInternalFrameTitlePane)))) isPalette;
+  ::javax::swing::Icon * paletteCloseIcon;
+  jint paletteTitleHeight;
+public: // actually package-private
+  ::javax::swing::JLabel * title;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalInternalFrameTitlePane__
diff --git a/libjava/javax/swing/plaf/metal/MetalInternalFrameUI$1.h b/libjava/javax/swing/plaf/metal/MetalInternalFrameUI$1.h
new file mode 100644
index 000000000..c707070ac
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalInternalFrameUI$1.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalInternalFrameUI$1__
+#define __javax_swing_plaf_metal_MetalInternalFrameUI$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalInternalFrameUI;
+            class MetalInternalFrameUI$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalInternalFrameUI$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  MetalInternalFrameUI$1(::javax::swing::plaf::metal::MetalInternalFrameUI *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalInternalFrameUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalInternalFrameUI$1__
diff --git a/libjava/javax/swing/plaf/metal/MetalInternalFrameUI.h b/libjava/javax/swing/plaf/metal/MetalInternalFrameUI.h
new file mode 100644
index 000000000..db9fe9d86
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalInternalFrameUI.h
@@ -0,0 +1,59 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalInternalFrameUI__
+#define __javax_swing_plaf_metal_MetalInternalFrameUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicInternalFrameUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class JInternalFrame;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalInternalFrameUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalInternalFrameUI : public ::javax::swing::plaf::basic::BasicInternalFrameUI
+{
+
+public:
+  MetalInternalFrameUI(::javax::swing::JInternalFrame *);
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::javax::swing::JComponent * createNorthPane(::javax::swing::JInternalFrame *);
+public:
+  virtual void setPalette(jboolean);
+public: // actually protected
+  virtual void installListeners();
+  virtual void uninstallListeners();
+  virtual void installKeyboardActions();
+  static ::java::lang::String * IS_PALETTE;
+private:
+  ::java::beans::PropertyChangeListener * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicInternalFrameUI)))) paletteListener;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalInternalFrameUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalLabelUI.h b/libjava/javax/swing/plaf/metal/MetalLabelUI.h
new file mode 100644
index 000000000..f91d0993d
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalLabelUI.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalLabelUI__
+#define __javax_swing_plaf_metal_MetalLabelUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicLabelUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class JLabel;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalLabelUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalLabelUI : public ::javax::swing::plaf::basic::BasicLabelUI
+{
+
+public:
+  MetalLabelUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void paintDisabledText(::javax::swing::JLabel *, ::java::awt::Graphics *, ::java::lang::String *, jint, jint);
+  static ::javax::swing::plaf::metal::MetalLabelUI * metalLabelUI;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalLabelUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalLookAndFeel$1.h b/libjava/javax/swing/plaf/metal/MetalLookAndFeel$1.h
new file mode 100644
index 000000000..cdcfae136
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalLookAndFeel$1.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalLookAndFeel$1__
+#define __javax_swing_plaf_metal_MetalLookAndFeel$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class UIDefaults;
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalLookAndFeel;
+            class MetalLookAndFeel$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalLookAndFeel$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  MetalLookAndFeel$1(::javax::swing::plaf::metal::MetalLookAndFeel *);
+public:
+  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalLookAndFeel$1__
diff --git a/libjava/javax/swing/plaf/metal/MetalLookAndFeel.h b/libjava/javax/swing/plaf/metal/MetalLookAndFeel.h
new file mode 100644
index 000000000..10a386dd0
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalLookAndFeel.h
@@ -0,0 +1,102 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalLookAndFeel__
+#define __javax_swing_plaf_metal_MetalLookAndFeel__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicLookAndFeel.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class UIDefaults;
+      namespace plaf
+      {
+          class ColorUIResource;
+          class FontUIResource;
+        namespace metal
+        {
+            class MetalLookAndFeel;
+            class MetalTheme;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalLookAndFeel : public ::javax::swing::plaf::basic::BasicLookAndFeel
+{
+
+public:
+  MetalLookAndFeel();
+public: // actually protected
+  virtual void createDefaultTheme();
+public:
+  virtual jboolean isNativeLookAndFeel();
+  virtual jboolean isSupportedLookAndFeel();
+  virtual ::java::lang::String * getDescription();
+  virtual ::java::lang::String * getID();
+  virtual ::java::lang::String * getName();
+  virtual ::javax::swing::UIDefaults * getDefaults();
+  static ::javax::swing::plaf::ColorUIResource * getAcceleratorForeground();
+  static ::javax::swing::plaf::ColorUIResource * getAcceleratorSelectedForeground();
+  static ::javax::swing::plaf::ColorUIResource * getBlack();
+  static ::javax::swing::plaf::ColorUIResource * getControl();
+  static ::javax::swing::plaf::ColorUIResource * getControlDarkShadow();
+  static ::javax::swing::plaf::ColorUIResource * getControlDisabled();
+  static ::javax::swing::plaf::ColorUIResource * getControlHighlight();
+  static ::javax::swing::plaf::ColorUIResource * getControlInfo();
+  static ::javax::swing::plaf::ColorUIResource * getControlShadow();
+  static ::javax::swing::plaf::ColorUIResource * getControlTextColor();
+  static ::javax::swing::plaf::FontUIResource * getControlTextFont();
+  static ::javax::swing::plaf::ColorUIResource * getDesktopColor();
+  static ::javax::swing::plaf::ColorUIResource * getFocusColor();
+  static ::javax::swing::plaf::ColorUIResource * getHighlightedTextColor();
+  static ::javax::swing::plaf::ColorUIResource * getInactiveControlTextColor();
+  static ::javax::swing::plaf::ColorUIResource * getInactiveSystemTextColor();
+  static ::javax::swing::plaf::ColorUIResource * getMenuBackground();
+  static ::javax::swing::plaf::ColorUIResource * getMenuDisabledForeground();
+  static ::javax::swing::plaf::ColorUIResource * getMenuForeground();
+  static ::javax::swing::plaf::ColorUIResource * getMenuSelectedBackground();
+  static ::javax::swing::plaf::ColorUIResource * getMenuSelectedForeground();
+  static ::javax::swing::plaf::FontUIResource * getMenuTextFont();
+  static ::javax::swing::plaf::ColorUIResource * getPrimaryControl();
+  static ::javax::swing::plaf::ColorUIResource * getPrimaryControlDarkShadow();
+  static ::javax::swing::plaf::ColorUIResource * getPrimaryControlHighlight();
+  static ::javax::swing::plaf::ColorUIResource * getPrimaryControlInfo();
+  static ::javax::swing::plaf::ColorUIResource * getPrimaryControlShadow();
+  static ::javax::swing::plaf::ColorUIResource * getSeparatorBackground();
+  static ::javax::swing::plaf::ColorUIResource * getSeparatorForeground();
+  static ::javax::swing::plaf::FontUIResource * getSubTextFont();
+  static ::javax::swing::plaf::ColorUIResource * getSystemTextColor();
+  static ::javax::swing::plaf::FontUIResource * getSystemTextFont();
+  static ::javax::swing::plaf::ColorUIResource * getTextHighlightColor();
+  static ::javax::swing::plaf::ColorUIResource * getUserTextColor();
+  static ::javax::swing::plaf::FontUIResource * getUserTextFont();
+  static ::javax::swing::plaf::ColorUIResource * getWhite();
+  static ::javax::swing::plaf::ColorUIResource * getWindowBackground();
+  static ::javax::swing::plaf::ColorUIResource * getWindowTitleBackground();
+  static ::javax::swing::plaf::FontUIResource * getWindowTitleFont();
+  static ::javax::swing::plaf::ColorUIResource * getWindowTitleForeground();
+  static ::javax::swing::plaf::ColorUIResource * getWindowTitleInactiveBackground();
+  static ::javax::swing::plaf::ColorUIResource * getWindowTitleInactiveForeground();
+  static void setCurrentTheme(::javax::swing::plaf::metal::MetalTheme *);
+public: // actually protected
+  virtual void initClassDefaults(::javax::swing::UIDefaults *);
+  virtual void initComponentDefaults(::javax::swing::UIDefaults *);
+  virtual void initSystemColorDefaults(::javax::swing::UIDefaults *);
+public:
+  static ::javax::swing::plaf::metal::MetalTheme * getCurrentTheme();
+  virtual jboolean getSupportsWindowDecorations();
+private:
+  static const jlong serialVersionUID = 6680646159193457980LL;
+  static ::javax::swing::plaf::metal::MetalTheme * theme;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalLookAndFeel__
diff --git a/libjava/javax/swing/plaf/metal/MetalMenuBarUI.h b/libjava/javax/swing/plaf/metal/MetalMenuBarUI.h
new file mode 100644
index 000000000..598291e40
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalMenuBarUI.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalMenuBarUI__
+#define __javax_swing_plaf_metal_MetalMenuBarUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicMenuBarUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalMenuBarUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalMenuBarUI : public ::javax::swing::plaf::basic::BasicMenuBarUI
+{
+
+public:
+  MetalMenuBarUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalMenuBarUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.h b/libjava/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.h
new file mode 100644
index 000000000..ca38d005b
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalPopupMenuSeparatorUI__
+#define __javax_swing_plaf_metal_MetalPopupMenuSeparatorUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/metal/MetalSeparatorUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalPopupMenuSeparatorUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalPopupMenuSeparatorUI : public ::javax::swing::plaf::metal::MetalSeparatorUI
+{
+
+public:
+  MetalPopupMenuSeparatorUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+private:
+  static ::javax::swing::plaf::metal::MetalPopupMenuSeparatorUI * instance;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalPopupMenuSeparatorUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalProgressBarUI.h b/libjava/javax/swing/plaf/metal/MetalProgressBarUI.h
new file mode 100644
index 000000000..ca9500ac5
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalProgressBarUI.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalProgressBarUI__
+#define __javax_swing_plaf_metal_MetalProgressBarUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicProgressBarUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalProgressBarUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalProgressBarUI : public ::javax::swing::plaf::basic::BasicProgressBarUI
+{
+
+public:
+  MetalProgressBarUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void paintDeterminate(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paintIndeterminate(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalProgressBarUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalRadioButtonUI.h b/libjava/javax/swing/plaf/metal/MetalRadioButtonUI.h
new file mode 100644
index 000000000..477bca7ca
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalRadioButtonUI.h
@@ -0,0 +1,63 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalRadioButtonUI__
+#define __javax_swing_plaf_metal_MetalRadioButtonUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicRadioButtonUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Dimension;
+        class Graphics;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class AbstractButton;
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalRadioButtonUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalRadioButtonUI : public ::javax::swing::plaf::basic::BasicRadioButtonUI
+{
+
+public:
+  MetalRadioButtonUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installDefaults(::javax::swing::AbstractButton *);
+public: // actually protected
+  virtual void uninstallDefaults(::javax::swing::AbstractButton *);
+  virtual ::java::awt::Color * getSelectColor();
+  virtual ::java::awt::Color * getDisabledTextColor();
+  virtual ::java::awt::Color * getFocusColor();
+public:
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+public: // actually protected
+  virtual void paintFocus(::java::awt::Graphics *, ::java::awt::Rectangle *, ::java::awt::Dimension *);
+  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicRadioButtonUI)))) focusColor;
+  ::java::awt::Color * selectColor;
+  ::java::awt::Color * disabledTextColor;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalRadioButtonUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalFrameBorder.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalFrameBorder.h
new file mode 100644
index 000000000..aa5a0eb84
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalFrameBorder.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalRootPaneUI$MetalFrameBorder__
+#define __javax_swing_plaf_metal_MetalRootPaneUI$MetalFrameBorder__
+
+#pragma interface
+
+#include <javax/swing/border/AbstractBorder.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalRootPaneUI$MetalFrameBorder;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalRootPaneUI$MetalFrameBorder : public ::javax::swing::border::AbstractBorder
+{
+
+  MetalRootPaneUI$MetalFrameBorder();
+public:
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+public: // actually package-private
+  MetalRootPaneUI$MetalFrameBorder(::javax::swing::plaf::metal::MetalRootPaneUI$MetalFrameBorder *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalRootPaneUI$MetalFrameBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalRootLayout.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalRootLayout.h
new file mode 100644
index 000000000..8cf2767d2
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalRootLayout.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalRootPaneUI$MetalRootLayout__
+#define __javax_swing_plaf_metal_MetalRootPaneUI$MetalRootLayout__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalRootPaneUI$MetalRootLayout;
+            class MetalRootPaneUI$MetalTitlePane;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalRootPaneUI$MetalRootLayout : public ::java::lang::Object
+{
+
+public: // actually package-private
+  MetalRootPaneUI$MetalRootLayout(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *);
+public:
+  virtual void addLayoutComponent(::java::awt::Component *, ::java::lang::Object *);
+  virtual ::java::awt::Dimension * maximumLayoutSize(::java::awt::Container *);
+  virtual jfloat getLayoutAlignmentX(::java::awt::Container *);
+  virtual jfloat getLayoutAlignmentY(::java::awt::Container *);
+  virtual void invalidateLayout(::java::awt::Container *);
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+  virtual void removeLayoutComponent(::java::awt::Component *);
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual void layoutContainer(::java::awt::Container *);
+private:
+  ::java::awt::Rectangle * __attribute__((aligned(__alignof__( ::java::lang::Object)))) glassPaneBounds;
+  ::java::awt::Rectangle * layeredPaneBounds;
+  ::java::awt::Rectangle * contentPaneBounds;
+  ::java::awt::Rectangle * menuBarBounds;
+  ::java::awt::Rectangle * titlePaneBounds;
+  ::java::awt::Dimension * prefSize;
+  ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane * titlePane;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalRootPaneUI$MetalRootLayout__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$CloseAction.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$CloseAction.h
new file mode 100644
index 000000000..5837b81a4
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$CloseAction.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$CloseAction__
+#define __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$CloseAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalRootPaneUI$MetalTitlePane;
+            class MetalRootPaneUI$MetalTitlePane$CloseAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane$CloseAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  MetalRootPaneUI$MetalTitlePane$CloseAction(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$CloseAction__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$IconifyAction.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$IconifyAction.h
new file mode 100644
index 000000000..ea82f5618
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$IconifyAction.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$IconifyAction__
+#define __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$IconifyAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalRootPaneUI$MetalTitlePane;
+            class MetalRootPaneUI$MetalTitlePane$IconifyAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane$IconifyAction : public ::javax::swing::AbstractAction
+{
+
+  MetalRootPaneUI$MetalTitlePane$IconifyAction(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  MetalRootPaneUI$MetalTitlePane$IconifyAction(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *, ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane$IconifyAction *);
+  ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$IconifyAction__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MaximizeAction.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MaximizeAction.h
new file mode 100644
index 000000000..bad5edc2a
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MaximizeAction.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$MaximizeAction__
+#define __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$MaximizeAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalRootPaneUI$MetalTitlePane;
+            class MetalRootPaneUI$MetalTitlePane$MaximizeAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane$MaximizeAction : public ::javax::swing::AbstractAction
+{
+
+  MetalRootPaneUI$MetalTitlePane$MaximizeAction(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  MetalRootPaneUI$MetalTitlePane$MaximizeAction(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *, ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane$MaximizeAction *);
+  ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$MaximizeAction__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout.h
new file mode 100644
index 000000000..5bc79486c
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout__
+#define __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Container;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalRootPaneUI$MetalTitlePane;
+            class MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout : public ::java::lang::Object
+{
+
+public:
+  MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *);
+  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
+  virtual void layoutContainer(::java::awt::Container *);
+  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
+  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
+  virtual void removeLayoutComponent(::java::awt::Component *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MouseHandler.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MouseHandler.h
new file mode 100644
index 000000000..a1ee9cd5c
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MouseHandler.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$MouseHandler__
+#define __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$MouseHandler__
+
+#pragma interface
+
+#include <javax/swing/event/MouseInputAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Point;
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalRootPaneUI$MetalTitlePane;
+            class MetalRootPaneUI$MetalTitlePane$MouseHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane$MouseHandler : public ::javax::swing::event::MouseInputAdapter
+{
+
+  MetalRootPaneUI$MetalTitlePane$MouseHandler(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *);
+public:
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  MetalRootPaneUI$MetalTitlePane$MouseHandler(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *, ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane$MouseHandler *);
+  ::java::awt::Point * __attribute__((aligned(__alignof__( ::javax::swing::event::MouseInputAdapter)))) lastDragLocation;
+  ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane * this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$MouseHandler__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$PaneButton.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$PaneButton.h
new file mode 100644
index 000000000..1505f5c47
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$PaneButton.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$PaneButton__
+#define __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$PaneButton__
+
+#pragma interface
+
+#include <javax/swing/JButton.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class Action;
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalRootPaneUI$MetalTitlePane;
+            class MetalRootPaneUI$MetalTitlePane$PaneButton;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane$PaneButton : public ::javax::swing::JButton
+{
+
+public:
+  MetalRootPaneUI$MetalTitlePane$PaneButton(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *, ::javax::swing::Action *);
+  virtual jboolean isFocusable();
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::JButton)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$PaneButton__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane.h
new file mode 100644
index 000000000..d9adc9b8a
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane.h
@@ -0,0 +1,98 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane__
+#define __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane__
+
+#pragma interface
+
+#include <javax/swing/JComponent.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Graphics;
+        class LayoutManager;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Action;
+        class Icon;
+        class JButton;
+        class JLabel;
+        class JMenu;
+        class JMenuBar;
+        class JRootPane;
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalRootPaneUI$MetalTitlePane;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane : public ::javax::swing::JComponent
+{
+
+public: // actually package-private
+  MetalRootPaneUI$MetalTitlePane(::javax::swing::JRootPane *);
+public: // actually protected
+  virtual ::java::awt::LayoutManager * createLayout();
+  virtual void installTitlePane();
+private:
+  void enableActions();
+  void addSubComponents();
+  void installListeners();
+  void createActions();
+  void assembleSystemMenu();
+public: // actually protected
+  virtual ::javax::swing::JMenuBar * createSystemMenuBar();
+  virtual ::javax::swing::JMenu * createSystemMenu();
+private:
+  void addSystemMenuItems(::javax::swing::JMenu *);
+public: // actually protected
+  virtual void createButtons();
+  virtual void setButtonIcons();
+public:
+  virtual void paintComponent(::java::awt::Graphics *);
+public: // actually protected
+  virtual void paintTitleBackground(::java::awt::Graphics *);
+private:
+  void installDefaults();
+public: // actually package-private
+  ::javax::swing::JRootPane * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) rootPane;
+  ::javax::swing::JButton * closeButton;
+  ::javax::swing::JButton * iconButton;
+  ::javax::swing::JButton * maxButton;
+  ::javax::swing::Icon * minIcon;
+  ::javax::swing::Icon * maxIcon;
+private:
+  ::javax::swing::Icon * iconIcon;
+public: // actually package-private
+  ::javax::swing::Icon * closeIcon;
+private:
+  ::java::awt::Color * notSelectedTitleColor;
+  ::java::awt::Color * selectedTitleColor;
+public: // actually package-private
+  ::javax::swing::JLabel * title;
+private:
+  ::javax::swing::Action * closeAction;
+  ::javax::swing::Action * iconifyAction;
+  ::javax::swing::Action * maximizeAction;
+  ::javax::swing::JMenuBar * menuBar;
+public: // actually protected
+  ::javax::swing::JMenu * windowMenu;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI.h
new file mode 100644
index 000000000..dad96a544
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalRootPaneUI.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalRootPaneUI__
+#define __javax_swing_plaf_metal_MetalRootPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicRootPaneUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class JRootPane;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalRootPaneUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalRootPaneUI : public ::javax::swing::plaf::basic::BasicRootPaneUI
+{
+
+public:
+  MetalRootPaneUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+private:
+  void installWindowDecorations(::javax::swing::JRootPane *);
+  void uninstallWindowDecorations(::javax::swing::JRootPane *);
+  static ::javax::swing::plaf::metal::MetalRootPaneUI * instance;
+public: // actually package-private
+  static jboolean $assertionsDisabled;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalRootPaneUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalScrollBarUI$MetalScrollBarPropertyChangeHandler.h b/libjava/javax/swing/plaf/metal/MetalScrollBarUI$MetalScrollBarPropertyChangeHandler.h
new file mode 100644
index 000000000..911ed4dde
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalScrollBarUI$MetalScrollBarPropertyChangeHandler.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalScrollBarUI$MetalScrollBarPropertyChangeHandler__
+#define __javax_swing_plaf_metal_MetalScrollBarUI$MetalScrollBarPropertyChangeHandler__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicScrollBarUI$PropertyChangeHandler.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalScrollBarUI;
+            class MetalScrollBarUI$MetalScrollBarPropertyChangeHandler;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalScrollBarUI$MetalScrollBarPropertyChangeHandler : public ::javax::swing::plaf::basic::BasicScrollBarUI$PropertyChangeHandler
+{
+
+public:
+  MetalScrollBarUI$MetalScrollBarPropertyChangeHandler(::javax::swing::plaf::metal::MetalScrollBarUI *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicScrollBarUI$PropertyChangeHandler)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalScrollBarUI$MetalScrollBarPropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/metal/MetalScrollBarUI.h b/libjava/javax/swing/plaf/metal/MetalScrollBarUI.h
new file mode 100644
index 000000000..f76d33bdd
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalScrollBarUI.h
@@ -0,0 +1,84 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalScrollBarUI__
+#define __javax_swing_plaf_metal_MetalScrollBarUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicScrollBarUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Dimension;
+        class Graphics;
+        class Rectangle;
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JButton;
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalScrollBarUI;
+            class MetalScrollButton;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalScrollBarUI : public ::javax::swing::plaf::basic::BasicScrollBarUI
+{
+
+public:
+  MetalScrollBarUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void installDefaults();
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
+  virtual ::javax::swing::JButton * createDecreaseButton(jint);
+  virtual ::javax::swing::JButton * createIncreaseButton(jint);
+  virtual void paintTrack(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *);
+private:
+  void paintTrackHorizontal(::java::awt::Graphics *, ::javax::swing::JComponent *, jint, jint, jint, jint);
+  void paintTrackVertical(::java::awt::Graphics *, ::javax::swing::JComponent *, jint, jint, jint, jint);
+public: // actually protected
+  virtual void paintThumb(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *);
+private:
+  void paintThumbHorizontal(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *);
+  void paintThumbVertical(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *);
+public: // actually protected
+  virtual ::java::awt::Dimension * getMinimumThumbSize();
+public:
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  static ::java::lang::String * FREE_STANDING_PROP;
+private:
+  static ::java::awt::Dimension * MIN_THUMB_SIZE;
+  static ::java::awt::Dimension * MIN_THUMB_SIZE_FREE_STANDING;
+public: // actually protected
+  ::javax::swing::plaf::metal::MetalScrollButton * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicScrollBarUI)))) increaseButton;
+  ::javax::swing::plaf::metal::MetalScrollButton * decreaseButton;
+  jint scrollBarWidth;
+  jboolean isFreeStanding;
+public: // actually package-private
+  ::java::awt::Color * scrollBarShadowColor;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalScrollBarUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalScrollButton.h b/libjava/javax/swing/plaf/metal/MetalScrollButton.h
new file mode 100644
index 000000000..3a3d86125
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalScrollButton.h
@@ -0,0 +1,65 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalScrollButton__
+#define __javax_swing_plaf_metal_MetalScrollButton__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicArrowButton.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalScrollButton;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalScrollButton : public ::javax::swing::plaf::basic::BasicArrowButton
+{
+
+public:
+  MetalScrollButton(jint, jint, jboolean);
+  virtual jint getButtonWidth();
+  virtual void setFreeStanding(jboolean);
+  virtual void paint(::java::awt::Graphics *);
+private:
+  void paintArrow(::java::awt::Graphics *, jint, jint);
+  void paintNorthBorderFreeStanding(::java::awt::Graphics *, jint, jint);
+  void paintSouthBorderFreeStanding(::java::awt::Graphics *, jint, jint);
+  void paintEastBorderFreeStanding(::java::awt::Graphics *, jint, jint);
+  void paintWestBorderFreeStanding(::java::awt::Graphics *, jint, jint);
+  void paintNorthBorder(::java::awt::Graphics *, jint, jint);
+  void paintSouthBorder(::java::awt::Graphics *, jint, jint);
+  void paintEastBorder(::java::awt::Graphics *, jint, jint);
+  void paintWestBorder(::java::awt::Graphics *, jint, jint);
+public:
+  virtual ::java::awt::Dimension * getPreferredSize();
+  virtual ::java::awt::Dimension * getMinimumSize();
+  virtual ::java::awt::Dimension * getMaximumSize();
+private:
+  static ::java::awt::Dimension * maximumSize;
+  jint __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicArrowButton)))) buttonWidth;
+  jboolean freeStanding;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalScrollButton__
diff --git a/libjava/javax/swing/plaf/metal/MetalScrollPaneUI.h b/libjava/javax/swing/plaf/metal/MetalScrollPaneUI.h
new file mode 100644
index 000000000..f751c355e
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalScrollPaneUI.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalScrollPaneUI__
+#define __javax_swing_plaf_metal_MetalScrollPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicScrollPaneUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class JScrollPane;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalScrollPaneUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalScrollPaneUI : public ::javax::swing::plaf::basic::BasicScrollPaneUI
+{
+
+public:
+  MetalScrollPaneUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual void installListeners(::javax::swing::JScrollPane *);
+  virtual void uninstallListeners(::javax::swing::JScrollPane *);
+public: // actually protected
+  virtual ::java::beans::PropertyChangeListener * createScrollBarSwapListener();
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalScrollPaneUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalSeparatorUI.h b/libjava/javax/swing/plaf/metal/MetalSeparatorUI.h
new file mode 100644
index 000000000..afa4a33c7
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalSeparatorUI.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalSeparatorUI__
+#define __javax_swing_plaf_metal_MetalSeparatorUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicSeparatorUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalSeparatorUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalSeparatorUI : public ::javax::swing::plaf::basic::BasicSeparatorUI
+{
+
+public:
+  MetalSeparatorUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+private:
+  static ::javax::swing::plaf::metal::MetalSeparatorUI * instance;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalSeparatorUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalSliderUI$MetalPropertyListener.h b/libjava/javax/swing/plaf/metal/MetalSliderUI$MetalPropertyListener.h
new file mode 100644
index 000000000..a3b9554cb
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalSliderUI$MetalPropertyListener.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalSliderUI$MetalPropertyListener__
+#define __javax_swing_plaf_metal_MetalSliderUI$MetalPropertyListener__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicSliderUI$PropertyChangeHandler.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalSliderUI;
+            class MetalSliderUI$MetalPropertyListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalSliderUI$MetalPropertyListener : public ::javax::swing::plaf::basic::BasicSliderUI$PropertyChangeHandler
+{
+
+public: // actually protected
+  MetalSliderUI$MetalPropertyListener(::javax::swing::plaf::metal::MetalSliderUI *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicSliderUI$PropertyChangeHandler)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalSliderUI$MetalPropertyListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalSliderUI.h b/libjava/javax/swing/plaf/metal/MetalSliderUI.h
new file mode 100644
index 000000000..555e0b37d
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalSliderUI.h
@@ -0,0 +1,85 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalSliderUI__
+#define __javax_swing_plaf_metal_MetalSliderUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicSliderUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Dimension;
+        class Graphics;
+        class Rectangle;
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+        class JComponent;
+        class JSlider;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalSliderUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalSliderUI : public ::javax::swing::plaf::basic::BasicSliderUI
+{
+
+public:
+  MetalSliderUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener(::javax::swing::JSlider *);
+public:
+  virtual void paintThumb(::java::awt::Graphics *);
+  virtual void paintTrack(::java::awt::Graphics *);
+  virtual void paintFocus(::java::awt::Graphics *);
+public: // actually protected
+  virtual ::java::awt::Dimension * getThumbSize();
+public:
+  virtual jint getTickLength();
+public: // actually protected
+  virtual jint getTrackWidth();
+  virtual jint getTrackLength();
+  virtual jint getThumbOverhang();
+  virtual void scrollDueToClickInTrack(jint);
+  virtual void paintMinorTickForHorizSlider(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
+  virtual void paintMajorTickForHorizSlider(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
+  virtual void paintMinorTickForVertSlider(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
+  virtual void paintMajorTickForVertSlider(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
+  static ::java::awt::Color * thumbColor;
+  static ::java::awt::Color * highlightColor;
+  static ::java::awt::Color * darkShadowColor;
+  static jint trackWidth;
+  static jint tickLength;
+  static ::javax::swing::Icon * horizThumbIcon;
+  static ::javax::swing::Icon * vertThumbIcon;
+  const jint __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicSliderUI)))) TICK_BUFFER;
+  ::java::lang::String * SLIDER_FILL;
+  jboolean filledSlider;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalSliderUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalSplitPaneDivider$MetalOneTouchButton.h b/libjava/javax/swing/plaf/metal/MetalSplitPaneDivider$MetalOneTouchButton.h
new file mode 100644
index 000000000..ee348d777
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalSplitPaneDivider$MetalOneTouchButton.h
@@ -0,0 +1,63 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalSplitPaneDivider$MetalOneTouchButton__
+#define __javax_swing_plaf_metal_MetalSplitPaneDivider$MetalOneTouchButton__
+
+#pragma interface
+
+#include <javax/swing/JButton.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace border
+      {
+          class Border;
+      }
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalSplitPaneDivider;
+            class MetalSplitPaneDivider$MetalOneTouchButton;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalSplitPaneDivider$MetalOneTouchButton : public ::javax::swing::JButton
+{
+
+public: // actually package-private
+  MetalSplitPaneDivider$MetalOneTouchButton(::javax::swing::plaf::metal::MetalSplitPaneDivider *, jint);
+public:
+  virtual void setBorder(::javax::swing::border::Border *);
+  virtual jboolean isFocusTraversable();
+  virtual void paint(::java::awt::Graphics *);
+public: // actually package-private
+  static const jint LEFT = 0;
+  static const jint RIGHT = 1;
+private:
+  JArray< ::java::awt::Color * > * __attribute__((aligned(__alignof__( ::javax::swing::JButton)))) colors;
+  jint direction;
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalSplitPaneDivider * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalSplitPaneDivider$MetalOneTouchButton__
diff --git a/libjava/javax/swing/plaf/metal/MetalSplitPaneDivider.h b/libjava/javax/swing/plaf/metal/MetalSplitPaneDivider.h
new file mode 100644
index 000000000..7230f6051
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalSplitPaneDivider.h
@@ -0,0 +1,60 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalSplitPaneDivider__
+#define __javax_swing_plaf_metal_MetalSplitPaneDivider__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicSplitPaneDivider.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JButton;
+        class JSplitPane;
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalSplitPaneDivider;
+            class MetalSplitPaneUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalSplitPaneDivider : public ::javax::swing::plaf::basic::BasicSplitPaneDivider
+{
+
+public:
+  MetalSplitPaneDivider(::javax::swing::plaf::metal::MetalSplitPaneUI *, ::java::awt::Color *, ::java::awt::Color *);
+  virtual void paint(::java::awt::Graphics *);
+public: // actually protected
+  virtual ::javax::swing::JButton * createLeftOneTouchButton();
+  virtual ::javax::swing::JButton * createRightOneTouchButton();
+public: // actually package-private
+  static JArray< JArray< jbyte > * > * BUTTON_SPRITE_L;
+  static JArray< JArray< jbyte > * > * BUTTON_SPRITE_R;
+  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicSplitPaneDivider)))) dark;
+  ::java::awt::Color * light;
+  ::javax::swing::JSplitPane * splitPane;
+  jint orientation;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalSplitPaneDivider__
diff --git a/libjava/javax/swing/plaf/metal/MetalSplitPaneUI.h b/libjava/javax/swing/plaf/metal/MetalSplitPaneUI.h
new file mode 100644
index 000000000..2505e06c2
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalSplitPaneUI.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalSplitPaneUI__
+#define __javax_swing_plaf_metal_MetalSplitPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicSplitPaneUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace basic
+        {
+            class BasicSplitPaneDivider;
+        }
+        namespace metal
+        {
+            class MetalSplitPaneUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalSplitPaneUI : public ::javax::swing::plaf::basic::BasicSplitPaneUI
+{
+
+public:
+  MetalSplitPaneUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual ::javax::swing::plaf::basic::BasicSplitPaneDivider * createDefaultDivider();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalSplitPaneUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalTabbedPaneUI$TabbedPaneLayout.h b/libjava/javax/swing/plaf/metal/MetalTabbedPaneUI$TabbedPaneLayout.h
new file mode 100644
index 000000000..0aa2214c5
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalTabbedPaneUI$TabbedPaneLayout.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalTabbedPaneUI$TabbedPaneLayout__
+#define __javax_swing_plaf_metal_MetalTabbedPaneUI$TabbedPaneLayout__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneLayout.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalTabbedPaneUI;
+            class MetalTabbedPaneUI$TabbedPaneLayout;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalTabbedPaneUI$TabbedPaneLayout : public ::javax::swing::plaf::basic::BasicTabbedPaneUI$TabbedPaneLayout
+{
+
+public:
+  MetalTabbedPaneUI$TabbedPaneLayout(::javax::swing::plaf::metal::MetalTabbedPaneUI *);
+public: // actually protected
+  virtual void rotateTabRuns(jint, jint);
+  virtual void padSelectedTab(jint, jint);
+  virtual void normalizeTabRuns(jint, jint, jint, jint);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalTabbedPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicTabbedPaneUI$TabbedPaneLayout)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalTabbedPaneUI$TabbedPaneLayout__
diff --git a/libjava/javax/swing/plaf/metal/MetalTabbedPaneUI.h b/libjava/javax/swing/plaf/metal/MetalTabbedPaneUI.h
new file mode 100644
index 000000000..12fdef6c9
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalTabbedPaneUI.h
@@ -0,0 +1,85 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalTabbedPaneUI__
+#define __javax_swing_plaf_metal_MetalTabbedPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicTabbedPaneUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Graphics;
+        class LayoutManager;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalTabbedPaneUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalTabbedPaneUI : public ::javax::swing::plaf::basic::BasicTabbedPaneUI
+{
+
+public:
+  MetalTabbedPaneUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::awt::LayoutManager * createLayoutManager();
+  virtual void paintTabBorder(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint, jboolean);
+  virtual void paintTopTabBorder(jint, ::java::awt::Graphics *, jint, jint, jint, jint, jint, jint, jboolean);
+  virtual void paintLeftTabBorder(jint, ::java::awt::Graphics *, jint, jint, jint, jint, jint, jint, jboolean);
+  virtual void paintRightTabBorder(jint, ::java::awt::Graphics *, jint, jint, jint, jint, jint, jint, jboolean);
+  virtual void paintBottomTabBorder(jint, ::java::awt::Graphics *, jint, jint, jint, jint, jint, jint, jboolean);
+  virtual void paintTabBackground(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint, jboolean);
+  virtual void paintFocusIndicator(::java::awt::Graphics *, jint, JArray< ::java::awt::Rectangle * > *, jint, ::java::awt::Rectangle *, ::java::awt::Rectangle *, jboolean);
+  virtual jboolean shouldPadTabRun(jint, jint);
+  virtual void installDefaults();
+  virtual ::java::awt::Color * getColorForGap(jint, jint, jint);
+  virtual jboolean shouldFillGap(jint, jint, jint, jint);
+  virtual void paintHighlightBelowTab();
+  virtual jboolean shouldRotateTabRuns(jint, jint);
+  virtual jint calculateMaxTabHeight(jint);
+  virtual jint getTabRunOverlay(jint);
+  virtual void paintContentBorderTopEdge(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint);
+  virtual void paintContentBorderBottomEdge(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint);
+  virtual void paintContentBorderLeftEdge(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint);
+  virtual void paintContentBorderRightEdge(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint);
+private:
+  jboolean isLastTabInRun(jint);
+  ::java::awt::Color * getUnselectedBackground(jint);
+public: // actually protected
+  virtual jint getTabLabelShiftX(jint, jint, jboolean);
+  virtual jint getTabLabelShiftY(jint, jint, jboolean);
+  jint __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicTabbedPaneUI)))) minTabWidth;
+  ::java::awt::Color * selectColor;
+  ::java::awt::Color * selectHighlight;
+  ::java::awt::Color * tabAreaBackground;
+private:
+  ::java::awt::Graphics * hg;
+  jboolean tabsOpaque;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalTabbedPaneUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalTextFieldUI.h b/libjava/javax/swing/plaf/metal/MetalTextFieldUI.h
new file mode 100644
index 000000000..610de0bfb
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalTextFieldUI.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalTextFieldUI__
+#define __javax_swing_plaf_metal_MetalTextFieldUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicTextFieldUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalTextFieldUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalTextFieldUI : public ::javax::swing::plaf::basic::BasicTextFieldUI
+{
+
+public:
+  MetalTextFieldUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalTextFieldUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalTheme.h b/libjava/javax/swing/plaf/metal/MetalTheme.h
new file mode 100644
index 000000000..e8e813a88
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalTheme.h
@@ -0,0 +1,94 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalTheme__
+#define __javax_swing_plaf_metal_MetalTheme__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class UIDefaults;
+      namespace plaf
+      {
+          class ColorUIResource;
+          class FontUIResource;
+        namespace metal
+        {
+            class MetalTheme;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalTheme : public ::java::lang::Object
+{
+
+public:
+  MetalTheme();
+  virtual ::java::lang::String * getName() = 0;
+  virtual void addCustomEntriesToTable(::javax::swing::UIDefaults *);
+  virtual ::javax::swing::plaf::ColorUIResource * getAcceleratorForeground();
+  virtual ::javax::swing::plaf::ColorUIResource * getAcceleratorSelectedForeground();
+  virtual ::javax::swing::plaf::ColorUIResource * getControl();
+  virtual ::javax::swing::plaf::ColorUIResource * getControlDarkShadow();
+  virtual ::javax::swing::plaf::ColorUIResource * getControlDisabled();
+  virtual ::javax::swing::plaf::ColorUIResource * getControlHighlight();
+  virtual ::javax::swing::plaf::ColorUIResource * getControlInfo();
+  virtual ::javax::swing::plaf::ColorUIResource * getControlShadow();
+  virtual ::javax::swing::plaf::ColorUIResource * getControlTextColor();
+  virtual ::javax::swing::plaf::ColorUIResource * getDesktopColor();
+  virtual ::javax::swing::plaf::ColorUIResource * getFocusColor();
+  virtual ::javax::swing::plaf::ColorUIResource * getHighlightedTextColor();
+  virtual ::javax::swing::plaf::ColorUIResource * getInactiveControlTextColor();
+  virtual ::javax::swing::plaf::ColorUIResource * getInactiveSystemTextColor();
+  virtual ::javax::swing::plaf::ColorUIResource * getMenuBackground();
+  virtual ::javax::swing::plaf::ColorUIResource * getMenuDisabledForeground();
+  virtual ::javax::swing::plaf::ColorUIResource * getMenuForeground();
+  virtual ::javax::swing::plaf::ColorUIResource * getMenuSelectedBackground();
+  virtual ::javax::swing::plaf::ColorUIResource * getMenuSelectedForeground();
+  virtual ::javax::swing::plaf::ColorUIResource * getPrimaryControl();
+  virtual ::javax::swing::plaf::ColorUIResource * getPrimaryControlDarkShadow();
+  virtual ::javax::swing::plaf::ColorUIResource * getPrimaryControlHighlight();
+  virtual ::javax::swing::plaf::ColorUIResource * getPrimaryControlInfo();
+  virtual ::javax::swing::plaf::ColorUIResource * getPrimaryControlShadow();
+  virtual ::javax::swing::plaf::ColorUIResource * getSeparatorBackground();
+  virtual ::javax::swing::plaf::ColorUIResource * getSeparatorForeground();
+  virtual ::javax::swing::plaf::ColorUIResource * getSystemTextColor();
+  virtual ::javax::swing::plaf::ColorUIResource * getTextHighlightColor();
+  virtual ::javax::swing::plaf::ColorUIResource * getUserTextColor();
+  virtual ::javax::swing::plaf::ColorUIResource * getWindowBackground();
+  virtual ::javax::swing::plaf::ColorUIResource * getWindowTitleBackground();
+  virtual ::javax::swing::plaf::ColorUIResource * getWindowTitleForeground();
+  virtual ::javax::swing::plaf::ColorUIResource * getWindowTitleInactiveBackground();
+  virtual ::javax::swing::plaf::ColorUIResource * getWindowTitleInactiveForeground();
+public: // actually protected
+  virtual ::javax::swing::plaf::ColorUIResource * getBlack();
+  virtual ::javax::swing::plaf::ColorUIResource * getWhite();
+  virtual ::javax::swing::plaf::ColorUIResource * getPrimary1() = 0;
+  virtual ::javax::swing::plaf::ColorUIResource * getPrimary2() = 0;
+  virtual ::javax::swing::plaf::ColorUIResource * getPrimary3() = 0;
+  virtual ::javax::swing::plaf::ColorUIResource * getSecondary1() = 0;
+  virtual ::javax::swing::plaf::ColorUIResource * getSecondary2() = 0;
+  virtual ::javax::swing::plaf::ColorUIResource * getSecondary3() = 0;
+public:
+  virtual ::javax::swing::plaf::FontUIResource * getControlTextFont() = 0;
+  virtual ::javax::swing::plaf::FontUIResource * getMenuTextFont() = 0;
+  virtual ::javax::swing::plaf::FontUIResource * getSubTextFont() = 0;
+  virtual ::javax::swing::plaf::FontUIResource * getSystemTextFont() = 0;
+  virtual ::javax::swing::plaf::FontUIResource * getUserTextFont() = 0;
+  virtual ::javax::swing::plaf::FontUIResource * getWindowTitleFont() = 0;
+private:
+  ::javax::swing::plaf::ColorUIResource * __attribute__((aligned(__alignof__( ::java::lang::Object)))) BLACK;
+  ::javax::swing::plaf::ColorUIResource * WHITE;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalTheme__
diff --git a/libjava/javax/swing/plaf/metal/MetalToggleButtonUI.h b/libjava/javax/swing/plaf/metal/MetalToggleButtonUI.h
new file mode 100644
index 000000000..a53cb8b01
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalToggleButtonUI.h
@@ -0,0 +1,65 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalToggleButtonUI__
+#define __javax_swing_plaf_metal_MetalToggleButtonUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicToggleButtonUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Graphics;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class AbstractButton;
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalToggleButtonUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalToggleButtonUI : public ::javax::swing::plaf::basic::BasicToggleButtonUI
+{
+
+public:
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  MetalToggleButtonUI();
+public: // actually protected
+  virtual ::java::awt::Color * getFocusColor();
+  virtual ::java::awt::Color * getSelectColor();
+  virtual ::java::awt::Color * getDisabledTextColor();
+public:
+  virtual void installDefaults(::javax::swing::AbstractButton *);
+public: // actually protected
+  virtual void paintButtonPressed(::java::awt::Graphics *, ::javax::swing::AbstractButton *);
+  virtual void paintText(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *, ::java::lang::String *);
+  virtual void paintFocus(::java::awt::Graphics *, ::javax::swing::AbstractButton *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, ::java::awt::Rectangle *);
+public:
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+public: // actually protected
+  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicToggleButtonUI)))) focusColor;
+  ::java::awt::Color * selectColor;
+  ::java::awt::Color * disabledTextColor;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalToggleButtonUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalToolBarUI$MetalContainerListener.h b/libjava/javax/swing/plaf/metal/MetalToolBarUI$MetalContainerListener.h
new file mode 100644
index 000000000..b04a7bb63
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalToolBarUI$MetalContainerListener.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalToolBarUI$MetalContainerListener__
+#define __javax_swing_plaf_metal_MetalToolBarUI$MetalContainerListener__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicToolBarUI$ToolBarContListener.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalToolBarUI;
+            class MetalToolBarUI$MetalContainerListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalToolBarUI$MetalContainerListener : public ::javax::swing::plaf::basic::BasicToolBarUI$ToolBarContListener
+{
+
+public: // actually protected
+  MetalToolBarUI$MetalContainerListener(::javax::swing::plaf::metal::MetalToolBarUI *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalToolBarUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicToolBarUI$ToolBarContListener)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalToolBarUI$MetalContainerListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalToolBarUI$MetalDockingListener.h b/libjava/javax/swing/plaf/metal/MetalToolBarUI$MetalDockingListener.h
new file mode 100644
index 000000000..f509544b3
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalToolBarUI$MetalDockingListener.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalToolBarUI$MetalDockingListener__
+#define __javax_swing_plaf_metal_MetalToolBarUI$MetalDockingListener__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicToolBarUI$DockingListener.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JToolBar;
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalToolBarUI;
+            class MetalToolBarUI$MetalDockingListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalToolBarUI$MetalDockingListener : public ::javax::swing::plaf::basic::BasicToolBarUI$DockingListener
+{
+
+public:
+  MetalToolBarUI$MetalDockingListener(::javax::swing::plaf::metal::MetalToolBarUI *, ::javax::swing::JToolBar *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalToolBarUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicToolBarUI$DockingListener)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalToolBarUI$MetalDockingListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalToolBarUI$MetalRolloverListener.h b/libjava/javax/swing/plaf/metal/MetalToolBarUI$MetalRolloverListener.h
new file mode 100644
index 000000000..8b254a6c1
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalToolBarUI$MetalRolloverListener.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalToolBarUI$MetalRolloverListener__
+#define __javax_swing_plaf_metal_MetalToolBarUI$MetalRolloverListener__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicToolBarUI$PropertyListener.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalToolBarUI;
+            class MetalToolBarUI$MetalRolloverListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalToolBarUI$MetalRolloverListener : public ::javax::swing::plaf::basic::BasicToolBarUI$PropertyListener
+{
+
+public: // actually protected
+  MetalToolBarUI$MetalRolloverListener(::javax::swing::plaf::metal::MetalToolBarUI *);
+public: // actually package-private
+  ::javax::swing::plaf::metal::MetalToolBarUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicToolBarUI$PropertyListener)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalToolBarUI$MetalRolloverListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalToolBarUI.h b/libjava/javax/swing/plaf/metal/MetalToolBarUI.h
new file mode 100644
index 000000000..95be69ffd
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalToolBarUI.h
@@ -0,0 +1,76 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalToolBarUI__
+#define __javax_swing_plaf_metal_MetalToolBarUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicToolBarUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+        class Point;
+      namespace event
+      {
+          class ContainerListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace border
+      {
+          class Border;
+      }
+      namespace event
+      {
+          class MouseInputListener;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalToolBarUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalToolBarUI : public ::javax::swing::plaf::basic::BasicToolBarUI
+{
+
+public:
+  MetalToolBarUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual ::java::beans::PropertyChangeListener * createRolloverListener();
+  virtual ::java::awt::event::ContainerListener * createContainerListener();
+  virtual ::javax::swing::border::Border * createNonRolloverBorder();
+  virtual void setDragOffset(::java::awt::Point *);
+  virtual ::javax::swing::event::MouseInputListener * createDockingListener();
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+public: // actually protected
+  ::java::awt::event::ContainerListener * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicToolBarUI)))) contListener;
+  ::java::beans::PropertyChangeListener * rolloverListener;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalToolBarUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalToolTipUI.h b/libjava/javax/swing/plaf/metal/MetalToolTipUI.h
new file mode 100644
index 000000000..f38637c6d
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalToolTipUI.h
@@ -0,0 +1,76 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalToolTipUI__
+#define __javax_swing_plaf_metal_MetalToolTipUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicToolTipUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Dimension;
+        class Font;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class KeyStroke;
+      namespace border
+      {
+          class Border;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalToolTipUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalToolTipUI : public ::javax::swing::plaf::basic::BasicToolTipUI
+{
+
+public:
+  MetalToolTipUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual ::java::lang::String * getAcceleratorString();
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual jboolean isAcceleratorHidden();
+public:
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+private:
+  ::java::lang::String * fetchAcceleratorString(::javax::swing::JComponent *);
+  ::java::lang::String * acceleratorToString(::javax::swing::KeyStroke *);
+public:
+  static const jint padSpaceBetweenStrings = 12;
+private:
+  static ::javax::swing::plaf::metal::MetalToolTipUI * instance;
+  jboolean __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicToolTipUI)))) isAcceleratorHidden__;
+  ::java::lang::String * acceleratorString;
+  ::java::lang::String * acceleratorDelimiter;
+  ::java::awt::Font * acceleratorFont;
+  ::java::awt::Color * acceleratorForeground;
+  ::javax::swing::border::Border * activeBorder;
+  ::javax::swing::border::Border * inactiveBorder;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalToolTipUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalTreeUI$LineStyleListener.h b/libjava/javax/swing/plaf/metal/MetalTreeUI$LineStyleListener.h
new file mode 100644
index 000000000..e0ffe068f
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalTreeUI$LineStyleListener.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalTreeUI$LineStyleListener__
+#define __javax_swing_plaf_metal_MetalTreeUI$LineStyleListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalTreeUI;
+            class MetalTreeUI$LineStyleListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalTreeUI$LineStyleListener : public ::java::lang::Object
+{
+
+  MetalTreeUI$LineStyleListener(::javax::swing::plaf::metal::MetalTreeUI *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  MetalTreeUI$LineStyleListener(::javax::swing::plaf::metal::MetalTreeUI *, ::javax::swing::plaf::metal::MetalTreeUI$LineStyleListener *);
+  ::javax::swing::plaf::metal::MetalTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalTreeUI$LineStyleListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalTreeUI.h b/libjava/javax/swing/plaf/metal/MetalTreeUI.h
new file mode 100644
index 000000000..98cf994a2
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalTreeUI.h
@@ -0,0 +1,80 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalTreeUI__
+#define __javax_swing_plaf_metal_MetalTreeUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicTreeUI.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+        class Insets;
+        class Rectangle;
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace metal
+        {
+            class MetalTreeUI;
+        }
+      }
+      namespace tree
+      {
+          class TreePath;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalTreeUI : public ::javax::swing::plaf::basic::BasicTreeUI
+{
+
+public:
+  MetalTreeUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual jint getHorizontalLegBuffer();
+public:
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+public: // actually protected
+  virtual void decodeLineStyle(::java::lang::Object *);
+  virtual jboolean isLocationInExpandControl(jint, jint, jint, jint);
+public:
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+public: // actually protected
+  virtual void paintHorizontalSeparators(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paintVerticalPartOfLeg(::java::awt::Graphics *, ::java::awt::Rectangle *, ::java::awt::Insets *, ::javax::swing::tree::TreePath *);
+  virtual void paintHorizontalPartOfLeg(::java::awt::Graphics *, ::java::awt::Rectangle *, ::java::awt::Insets *, ::java::awt::Rectangle *, ::javax::swing::tree::TreePath *, jint, jboolean, jboolean, jboolean);
+private:
+  static ::java::lang::String * LINE_STYLE_PROPERTY;
+  static ::java::lang::String * LINE_STYLE_VALUE_NONE;
+  static ::java::lang::String * LINE_STYLE_VALUE_ANGLED;
+  static ::java::lang::String * LINE_STYLE_VALUE_HORIZONTAL;
+  static const jint LINE_STYLE_NONE = 0;
+  static const jint LINE_STYLE_ANGLED = 1;
+  static const jint LINE_STYLE_HORIZONTAL = 2;
+  jint __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicTreeUI)))) lineStyle;
+  ::java::beans::PropertyChangeListener * lineStyleListener;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalTreeUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalUtils.h b/libjava/javax/swing/plaf/metal/MetalUtils.h
new file mode 100644
index 000000000..3dd94a23f
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/MetalUtils.h
@@ -0,0 +1,67 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_MetalUtils__
+#define __javax_swing_plaf_metal_MetalUtils__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Graphics;
+        class Graphics2D;
+      namespace image
+      {
+          class BufferedImage;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace metal
+        {
+            class MetalUtils;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::MetalUtils : public ::java::lang::Object
+{
+
+public: // actually package-private
+  MetalUtils();
+  static void fillMetalPattern(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::Color *);
+  static void fillMetalPattern2D(::java::awt::Graphics2D *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::Color *);
+  static void initializePattern(::java::awt::Color *, ::java::awt::Color *);
+  static void paintGradient(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::lang::String *);
+  static void paintGradient(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::lang::String *, JArray< JArray< jint > * > *);
+  static void paintGradient(::java::awt::Graphics *, jint, jint, jint, jint, jfloat, jfloat, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, jint, JArray< JArray< jint > * > *);
+  static void paintHorizontalGradient(::java::awt::Graphics *, jint, jint, jint, jint, jfloat, jfloat, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, JArray< JArray< jint > * > *);
+  static void paintVerticalGradient(::java::awt::Graphics *, jint, jint, jint, jint, jfloat, jfloat, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, JArray< JArray< jint > * > *);
+private:
+  static void paintHorizontalGradient2D(::java::awt::Graphics2D *, jint, jint, jint, jint, jfloat, jfloat, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, JArray< JArray< jint > * > *);
+  static void paintVerticalGradient2D(::java::awt::Graphics2D *, jint, jint, jint, jint, jfloat, jfloat, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, JArray< JArray< jint > * > *);
+public: // actually package-private
+  static ::java::awt::image::BufferedImage * pattern2D;
+  static ::java::awt::Color * lightColor;
+  static ::java::awt::Color * darkColor;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_MetalUtils__
diff --git a/libjava/javax/swing/plaf/metal/OceanTheme.h b/libjava/javax/swing/plaf/metal/OceanTheme.h
new file mode 100644
index 000000000..258760981
--- /dev/null
+++ b/libjava/javax/swing/plaf/metal/OceanTheme.h
@@ -0,0 +1,62 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_metal_OceanTheme__
+#define __javax_swing_plaf_metal_OceanTheme__
+
+#pragma interface
+
+#include <javax/swing/plaf/metal/DefaultMetalTheme.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class UIDefaults;
+      namespace plaf
+      {
+          class ColorUIResource;
+        namespace metal
+        {
+            class OceanTheme;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::metal::OceanTheme : public ::javax::swing::plaf::metal::DefaultMetalTheme
+{
+
+public:
+  OceanTheme();
+  virtual ::java::lang::String * getName();
+  virtual ::javax::swing::plaf::ColorUIResource * getControlTextColor();
+  virtual ::javax::swing::plaf::ColorUIResource * getDesktopColor();
+  virtual ::javax::swing::plaf::ColorUIResource * getInactiveControlTextColor();
+  virtual ::javax::swing::plaf::ColorUIResource * getMenuDisabledForeground();
+public: // actually protected
+  virtual ::javax::swing::plaf::ColorUIResource * getBlack();
+  virtual ::javax::swing::plaf::ColorUIResource * getPrimary1();
+  virtual ::javax::swing::plaf::ColorUIResource * getPrimary2();
+  virtual ::javax::swing::plaf::ColorUIResource * getPrimary3();
+  virtual ::javax::swing::plaf::ColorUIResource * getSecondary1();
+  virtual ::javax::swing::plaf::ColorUIResource * getSecondary2();
+  virtual ::javax::swing::plaf::ColorUIResource * getSecondary3();
+public:
+  virtual void addCustomEntriesToTable(::javax::swing::UIDefaults *);
+public: // actually package-private
+  static ::javax::swing::plaf::ColorUIResource * BLACK;
+  static ::javax::swing::plaf::ColorUIResource * PRIMARY1;
+  static ::javax::swing::plaf::ColorUIResource * PRIMARY2;
+  static ::javax::swing::plaf::ColorUIResource * PRIMARY3;
+  static ::javax::swing::plaf::ColorUIResource * SECONDARY1;
+  static ::javax::swing::plaf::ColorUIResource * SECONDARY2;
+  static ::javax::swing::plaf::ColorUIResource * SECONDARY3;
+  static ::javax::swing::plaf::ColorUIResource * INACTIVE_CONTROL_TEXT;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_metal_OceanTheme__
diff --git a/libjava/javax/swing/plaf/multi/MultiButtonUI.h b/libjava/javax/swing/plaf/multi/MultiButtonUI.h
new file mode 100644
index 000000000..3481b6eee
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiButtonUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiButtonUI__
+#define __javax_swing_plaf_multi_MultiButtonUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ButtonUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiButtonUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiButtonUI : public ::javax::swing::plaf::ButtonUI
+{
+
+public:
+  MultiButtonUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ButtonUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiButtonUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiColorChooserUI.h b/libjava/javax/swing/plaf/multi/MultiColorChooserUI.h
new file mode 100644
index 000000000..d890eeabe
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiColorChooserUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiColorChooserUI__
+#define __javax_swing_plaf_multi_MultiColorChooserUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ColorChooserUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiColorChooserUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiColorChooserUI : public ::javax::swing::plaf::ColorChooserUI
+{
+
+public:
+  MultiColorChooserUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ColorChooserUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiColorChooserUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiComboBoxUI.h b/libjava/javax/swing/plaf/multi/MultiComboBoxUI.h
new file mode 100644
index 000000000..9e92a3237
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiComboBoxUI.h
@@ -0,0 +1,70 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiComboBoxUI__
+#define __javax_swing_plaf_multi_MultiComboBoxUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ComboBoxUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComboBox;
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiComboBoxUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiComboBoxUI : public ::javax::swing::plaf::ComboBoxUI
+{
+
+public:
+  MultiComboBoxUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+  virtual void setPopupVisible(::javax::swing::JComboBox *, jboolean);
+  virtual jboolean isPopupVisible(::javax::swing::JComboBox *);
+  virtual jboolean isFocusTraversable(::javax::swing::JComboBox *);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ComboBoxUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiComboBoxUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiDesktopIconUI.h b/libjava/javax/swing/plaf/multi/MultiDesktopIconUI.h
new file mode 100644
index 000000000..d7a5f47fe
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiDesktopIconUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiDesktopIconUI__
+#define __javax_swing_plaf_multi_MultiDesktopIconUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/DesktopIconUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiDesktopIconUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiDesktopIconUI : public ::javax::swing::plaf::DesktopIconUI
+{
+
+public:
+  MultiDesktopIconUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::DesktopIconUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiDesktopIconUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiDesktopPaneUI.h b/libjava/javax/swing/plaf/multi/MultiDesktopPaneUI.h
new file mode 100644
index 000000000..d6dcff2c2
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiDesktopPaneUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiDesktopPaneUI__
+#define __javax_swing_plaf_multi_MultiDesktopPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/DesktopPaneUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiDesktopPaneUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiDesktopPaneUI : public ::javax::swing::plaf::DesktopPaneUI
+{
+
+public:
+  MultiDesktopPaneUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::DesktopPaneUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiDesktopPaneUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiFileChooserUI.h b/libjava/javax/swing/plaf/multi/MultiFileChooserUI.h
new file mode 100644
index 000000000..e459d3280
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiFileChooserUI.h
@@ -0,0 +1,78 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiFileChooserUI__
+#define __javax_swing_plaf_multi_MultiFileChooserUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/FileChooserUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+        class JFileChooser;
+      namespace filechooser
+      {
+          class FileFilter;
+          class FileView;
+      }
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiFileChooserUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiFileChooserUI : public ::javax::swing::plaf::FileChooserUI
+{
+
+public:
+  MultiFileChooserUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+  virtual ::javax::swing::filechooser::FileFilter * getAcceptAllFileFilter(::javax::swing::JFileChooser *);
+  virtual ::javax::swing::filechooser::FileView * getFileView(::javax::swing::JFileChooser *);
+  virtual ::java::lang::String * getApproveButtonText(::javax::swing::JFileChooser *);
+  virtual ::java::lang::String * getDialogTitle(::javax::swing::JFileChooser *);
+  virtual void rescanCurrentDirectory(::javax::swing::JFileChooser *);
+  virtual void ensureFileIsVisible(::javax::swing::JFileChooser *, ::java::io::File *);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::FileChooserUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiFileChooserUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiInternalFrameUI.h b/libjava/javax/swing/plaf/multi/MultiInternalFrameUI.h
new file mode 100644
index 000000000..ab260b709
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiInternalFrameUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiInternalFrameUI__
+#define __javax_swing_plaf_multi_MultiInternalFrameUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/InternalFrameUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiInternalFrameUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiInternalFrameUI : public ::javax::swing::plaf::InternalFrameUI
+{
+
+public:
+  MultiInternalFrameUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::InternalFrameUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiInternalFrameUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiLabelUI.h b/libjava/javax/swing/plaf/multi/MultiLabelUI.h
new file mode 100644
index 000000000..7f5049cec
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiLabelUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiLabelUI__
+#define __javax_swing_plaf_multi_MultiLabelUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/LabelUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiLabelUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiLabelUI : public ::javax::swing::plaf::LabelUI
+{
+
+public:
+  MultiLabelUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::LabelUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiLabelUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiListUI.h b/libjava/javax/swing/plaf/multi/MultiListUI.h
new file mode 100644
index 000000000..3147894c6
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiListUI.h
@@ -0,0 +1,72 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiListUI__
+#define __javax_swing_plaf_multi_MultiListUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ListUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+        class Point;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+        class JList;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiListUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiListUI : public ::javax::swing::plaf::ListUI
+{
+
+public:
+  MultiListUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+  virtual jint locationToIndex(::javax::swing::JList *, ::java::awt::Point *);
+  virtual ::java::awt::Point * indexToLocation(::javax::swing::JList *, jint);
+  virtual ::java::awt::Rectangle * getCellBounds(::javax::swing::JList *, jint, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ListUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiListUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiLookAndFeel.h b/libjava/javax/swing/plaf/multi/MultiLookAndFeel.h
new file mode 100644
index 000000000..83925d036
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiLookAndFeel.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiLookAndFeel__
+#define __javax_swing_plaf_multi_MultiLookAndFeel__
+
+#pragma interface
+
+#include <javax/swing/LookAndFeel.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class UIDefaults;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiLookAndFeel;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiLookAndFeel : public ::javax::swing::LookAndFeel
+{
+
+public:
+  MultiLookAndFeel();
+  virtual ::java::lang::String * getName();
+  virtual ::java::lang::String * getID();
+  virtual ::java::lang::String * getDescription();
+  virtual jboolean isNativeLookAndFeel();
+  virtual jboolean isSupportedLookAndFeel();
+  virtual ::javax::swing::UIDefaults * getDefaults();
+  static ::javax::swing::plaf::ComponentUI * createUIs(::javax::swing::plaf::ComponentUI *, ::java::util::Vector *, ::javax::swing::JComponent *);
+public: // actually protected
+  static JArray< ::javax::swing::plaf::ComponentUI * > * uisToArray(::java::util::Vector *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiLookAndFeel__
diff --git a/libjava/javax/swing/plaf/multi/MultiMenuBarUI.h b/libjava/javax/swing/plaf/multi/MultiMenuBarUI.h
new file mode 100644
index 000000000..9056557b4
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiMenuBarUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiMenuBarUI__
+#define __javax_swing_plaf_multi_MultiMenuBarUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/MenuBarUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiMenuBarUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiMenuBarUI : public ::javax::swing::plaf::MenuBarUI
+{
+
+public:
+  MultiMenuBarUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::MenuBarUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiMenuBarUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiMenuItemUI.h b/libjava/javax/swing/plaf/multi/MultiMenuItemUI.h
new file mode 100644
index 000000000..7bbe2f231
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiMenuItemUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiMenuItemUI__
+#define __javax_swing_plaf_multi_MultiMenuItemUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/MenuItemUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiMenuItemUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiMenuItemUI : public ::javax::swing::plaf::MenuItemUI
+{
+
+public:
+  MultiMenuItemUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::MenuItemUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiMenuItemUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiOptionPaneUI.h b/libjava/javax/swing/plaf/multi/MultiOptionPaneUI.h
new file mode 100644
index 000000000..ce895299c
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiOptionPaneUI.h
@@ -0,0 +1,69 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiOptionPaneUI__
+#define __javax_swing_plaf_multi_MultiOptionPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/OptionPaneUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+        class JOptionPane;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiOptionPaneUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiOptionPaneUI : public ::javax::swing::plaf::OptionPaneUI
+{
+
+public:
+  MultiOptionPaneUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+  virtual void selectInitialValue(::javax::swing::JOptionPane *);
+  virtual jboolean containsCustomComponents(::javax::swing::JOptionPane *);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::OptionPaneUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiOptionPaneUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiPanelUI.h b/libjava/javax/swing/plaf/multi/MultiPanelUI.h
new file mode 100644
index 000000000..83ac57c09
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiPanelUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiPanelUI__
+#define __javax_swing_plaf_multi_MultiPanelUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/PanelUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiPanelUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiPanelUI : public ::javax::swing::plaf::PanelUI
+{
+
+public:
+  MultiPanelUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::PanelUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiPanelUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiPopupMenuUI.h b/libjava/javax/swing/plaf/multi/MultiPopupMenuUI.h
new file mode 100644
index 000000000..717775652
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiPopupMenuUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiPopupMenuUI__
+#define __javax_swing_plaf_multi_MultiPopupMenuUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/PopupMenuUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiPopupMenuUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiPopupMenuUI : public ::javax::swing::plaf::PopupMenuUI
+{
+
+public:
+  MultiPopupMenuUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::PopupMenuUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiPopupMenuUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiProgressBarUI.h b/libjava/javax/swing/plaf/multi/MultiProgressBarUI.h
new file mode 100644
index 000000000..797f3cab5
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiProgressBarUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiProgressBarUI__
+#define __javax_swing_plaf_multi_MultiProgressBarUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ProgressBarUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiProgressBarUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiProgressBarUI : public ::javax::swing::plaf::ProgressBarUI
+{
+
+public:
+  MultiProgressBarUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ProgressBarUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiProgressBarUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiRootPaneUI.h b/libjava/javax/swing/plaf/multi/MultiRootPaneUI.h
new file mode 100644
index 000000000..b45c22996
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiRootPaneUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiRootPaneUI__
+#define __javax_swing_plaf_multi_MultiRootPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/RootPaneUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiRootPaneUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiRootPaneUI : public ::javax::swing::plaf::RootPaneUI
+{
+
+public:
+  MultiRootPaneUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::RootPaneUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiRootPaneUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiScrollBarUI.h b/libjava/javax/swing/plaf/multi/MultiScrollBarUI.h
new file mode 100644
index 000000000..0fd88116a
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiScrollBarUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiScrollBarUI__
+#define __javax_swing_plaf_multi_MultiScrollBarUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ScrollBarUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiScrollBarUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiScrollBarUI : public ::javax::swing::plaf::ScrollBarUI
+{
+
+public:
+  MultiScrollBarUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ScrollBarUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiScrollBarUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiScrollPaneUI.h b/libjava/javax/swing/plaf/multi/MultiScrollPaneUI.h
new file mode 100644
index 000000000..a05716a60
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiScrollPaneUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiScrollPaneUI__
+#define __javax_swing_plaf_multi_MultiScrollPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ScrollPaneUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiScrollPaneUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiScrollPaneUI : public ::javax::swing::plaf::ScrollPaneUI
+{
+
+public:
+  MultiScrollPaneUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ScrollPaneUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiScrollPaneUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiSeparatorUI.h b/libjava/javax/swing/plaf/multi/MultiSeparatorUI.h
new file mode 100644
index 000000000..b62235a18
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiSeparatorUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiSeparatorUI__
+#define __javax_swing_plaf_multi_MultiSeparatorUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/SeparatorUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiSeparatorUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiSeparatorUI : public ::javax::swing::plaf::SeparatorUI
+{
+
+public:
+  MultiSeparatorUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::SeparatorUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiSeparatorUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiSliderUI.h b/libjava/javax/swing/plaf/multi/MultiSliderUI.h
new file mode 100644
index 000000000..b66d32ab5
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiSliderUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiSliderUI__
+#define __javax_swing_plaf_multi_MultiSliderUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/SliderUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiSliderUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiSliderUI : public ::javax::swing::plaf::SliderUI
+{
+
+public:
+  MultiSliderUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::SliderUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiSliderUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiSpinnerUI.h b/libjava/javax/swing/plaf/multi/MultiSpinnerUI.h
new file mode 100644
index 000000000..32a9d8682
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiSpinnerUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiSpinnerUI__
+#define __javax_swing_plaf_multi_MultiSpinnerUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/SpinnerUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiSpinnerUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiSpinnerUI : public ::javax::swing::plaf::SpinnerUI
+{
+
+public:
+  MultiSpinnerUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::SpinnerUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiSpinnerUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiSplitPaneUI.h b/libjava/javax/swing/plaf/multi/MultiSplitPaneUI.h
new file mode 100644
index 000000000..5ed5638fe
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiSplitPaneUI.h
@@ -0,0 +1,73 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiSplitPaneUI__
+#define __javax_swing_plaf_multi_MultiSplitPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/SplitPaneUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+        class JSplitPane;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiSplitPaneUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiSplitPaneUI : public ::javax::swing::plaf::SplitPaneUI
+{
+
+public:
+  MultiSplitPaneUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+  virtual void resetToPreferredSizes(::javax::swing::JSplitPane *);
+  virtual void setDividerLocation(::javax::swing::JSplitPane *, jint);
+  virtual jint getDividerLocation(::javax::swing::JSplitPane *);
+  virtual jint getMinimumDividerLocation(::javax::swing::JSplitPane *);
+  virtual jint getMaximumDividerLocation(::javax::swing::JSplitPane *);
+  virtual void finishedPaintingChildren(::javax::swing::JSplitPane *, ::java::awt::Graphics *);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::SplitPaneUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiSplitPaneUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiTabbedPaneUI.h b/libjava/javax/swing/plaf/multi/MultiTabbedPaneUI.h
new file mode 100644
index 000000000..7740c3fd1
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiTabbedPaneUI.h
@@ -0,0 +1,71 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiTabbedPaneUI__
+#define __javax_swing_plaf_multi_MultiTabbedPaneUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/TabbedPaneUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+        class JTabbedPane;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiTabbedPaneUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiTabbedPaneUI : public ::javax::swing::plaf::TabbedPaneUI
+{
+
+public:
+  MultiTabbedPaneUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+  virtual jint tabForCoordinate(::javax::swing::JTabbedPane *, jint, jint);
+  virtual ::java::awt::Rectangle * getTabBounds(::javax::swing::JTabbedPane *, jint);
+  virtual jint getTabRunCount(::javax::swing::JTabbedPane *);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TabbedPaneUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiTabbedPaneUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiTableHeaderUI.h b/libjava/javax/swing/plaf/multi/MultiTableHeaderUI.h
new file mode 100644
index 000000000..87cf03ef5
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiTableHeaderUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiTableHeaderUI__
+#define __javax_swing_plaf_multi_MultiTableHeaderUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/TableHeaderUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiTableHeaderUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiTableHeaderUI : public ::javax::swing::plaf::TableHeaderUI
+{
+
+public:
+  MultiTableHeaderUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TableHeaderUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiTableHeaderUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiTableUI.h b/libjava/javax/swing/plaf/multi/MultiTableUI.h
new file mode 100644
index 000000000..cb84f0f2c
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiTableUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiTableUI__
+#define __javax_swing_plaf_multi_MultiTableUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/TableUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiTableUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiTableUI : public ::javax::swing::plaf::TableUI
+{
+
+public:
+  MultiTableUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TableUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiTableUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiTextUI.h b/libjava/javax/swing/plaf/multi/MultiTextUI.h
new file mode 100644
index 000000000..6d0440e7a
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiTextUI.h
@@ -0,0 +1,84 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiTextUI__
+#define __javax_swing_plaf_multi_MultiTextUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/TextUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+        class Point;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiTextUI;
+        }
+      }
+      namespace text
+      {
+          class EditorKit;
+          class JTextComponent;
+          class Position$Bias;
+          class View;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiTextUI : public ::javax::swing::plaf::TextUI
+{
+
+public:
+  MultiTextUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+  virtual ::java::awt::Rectangle * modelToView(::javax::swing::text::JTextComponent *, jint);
+  virtual ::java::awt::Rectangle * modelToView(::javax::swing::text::JTextComponent *, jint, ::javax::swing::text::Position$Bias *);
+  virtual jint viewToModel(::javax::swing::text::JTextComponent *, ::java::awt::Point *);
+  virtual jint viewToModel(::javax::swing::text::JTextComponent *, ::java::awt::Point *, JArray< ::javax::swing::text::Position$Bias * > *);
+  virtual jint getNextVisualPositionFrom(::javax::swing::text::JTextComponent *, jint, ::javax::swing::text::Position$Bias *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
+  virtual void damageRange(::javax::swing::text::JTextComponent *, jint, jint);
+  virtual void damageRange(::javax::swing::text::JTextComponent *, jint, jint, ::javax::swing::text::Position$Bias *, ::javax::swing::text::Position$Bias *);
+  virtual ::javax::swing::text::EditorKit * getEditorKit(::javax::swing::text::JTextComponent *);
+  virtual ::javax::swing::text::View * getRootView(::javax::swing::text::JTextComponent *);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TextUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiTextUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiToolBarUI.h b/libjava/javax/swing/plaf/multi/MultiToolBarUI.h
new file mode 100644
index 000000000..91c891628
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiToolBarUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiToolBarUI__
+#define __javax_swing_plaf_multi_MultiToolBarUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ToolBarUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiToolBarUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiToolBarUI : public ::javax::swing::plaf::ToolBarUI
+{
+
+public:
+  MultiToolBarUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ToolBarUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiToolBarUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiToolTipUI.h b/libjava/javax/swing/plaf/multi/MultiToolTipUI.h
new file mode 100644
index 000000000..07ed28e73
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiToolTipUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiToolTipUI__
+#define __javax_swing_plaf_multi_MultiToolTipUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ToolTipUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiToolTipUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiToolTipUI : public ::javax::swing::plaf::ToolTipUI
+{
+
+public:
+  MultiToolTipUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ToolTipUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiToolTipUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiTreeUI.h b/libjava/javax/swing/plaf/multi/MultiTreeUI.h
new file mode 100644
index 000000000..0477cc626
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiTreeUI.h
@@ -0,0 +1,82 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiTreeUI__
+#define __javax_swing_plaf_multi_MultiTreeUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/TreeUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+        class JTree;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiTreeUI;
+        }
+      }
+      namespace tree
+      {
+          class TreePath;
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiTreeUI : public ::javax::swing::plaf::TreeUI
+{
+
+public:
+  MultiTreeUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+  virtual ::java::awt::Rectangle * getPathBounds(::javax::swing::JTree *, ::javax::swing::tree::TreePath *);
+  virtual ::javax::swing::tree::TreePath * getPathForRow(::javax::swing::JTree *, jint);
+  virtual jint getRowForPath(::javax::swing::JTree *, ::javax::swing::tree::TreePath *);
+  virtual jint getRowCount(::javax::swing::JTree *);
+  virtual ::javax::swing::tree::TreePath * getClosestPathForLocation(::javax::swing::JTree *, jint, jint);
+  virtual jboolean isEditing(::javax::swing::JTree *);
+  virtual jboolean stopEditing(::javax::swing::JTree *);
+  virtual void cancelEditing(::javax::swing::JTree *);
+  virtual void startEditingAtPath(::javax::swing::JTree *, ::javax::swing::tree::TreePath *);
+  virtual ::javax::swing::tree::TreePath * getEditingPath(::javax::swing::JTree *);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TreeUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiTreeUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiViewportUI.h b/libjava/javax/swing/plaf/multi/MultiViewportUI.h
new file mode 100644
index 000000000..6ddbb0b9b
--- /dev/null
+++ b/libjava/javax/swing/plaf/multi/MultiViewportUI.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_multi_MultiViewportUI__
+#define __javax_swing_plaf_multi_MultiViewportUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/ViewportUI.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+    }
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace multi
+        {
+            class MultiViewportUI;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::multi::MultiViewportUI : public ::javax::swing::plaf::ViewportUI
+{
+
+public:
+  MultiViewportUI();
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void installUI(::javax::swing::JComponent *);
+  virtual void uninstallUI(::javax::swing::JComponent *);
+  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
+  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
+  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
+  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ViewportUI)))) uis;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_multi_MultiViewportUI__
diff --git a/libjava/javax/swing/plaf/synth/ColorType.h b/libjava/javax/swing/plaf/synth/ColorType.h
new file mode 100644
index 000000000..99a238cf3
--- /dev/null
+++ b/libjava/javax/swing/plaf/synth/ColorType.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_synth_ColorType__
+#define __javax_swing_plaf_synth_ColorType__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace synth
+        {
+            class ColorType;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::synth::ColorType : public ::java::lang::Object
+{
+
+public: // actually protected
+  ColorType(::java::lang::String *);
+public:
+  virtual jint getID();
+  virtual ::java::lang::String * toString();
+  static ::javax::swing::plaf::synth::ColorType * FOREGROUND;
+  static ::javax::swing::plaf::synth::ColorType * BACKGROUND;
+  static ::javax::swing::plaf::synth::ColorType * TEXT_FOREGROUND;
+  static ::javax::swing::plaf::synth::ColorType * TEXT_BACKGROUND;
+  static ::javax::swing::plaf::synth::ColorType * FOCUS;
+  static jint MAX_COUNT;
+private:
+  static jint count;
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) id;
+  ::java::lang::String * description;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_synth_ColorType__
diff --git a/libjava/javax/swing/plaf/synth/Region.h b/libjava/javax/swing/plaf/synth/Region.h
new file mode 100644
index 000000000..1df2b4f9f
--- /dev/null
+++ b/libjava/javax/swing/plaf/synth/Region.h
@@ -0,0 +1,102 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_synth_Region__
+#define __javax_swing_plaf_synth_Region__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace synth
+        {
+            class Region;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::synth::Region : public ::java::lang::Object
+{
+
+public: // actually protected
+  Region(::java::lang::String *, ::java::lang::String *, jboolean);
+public:
+  virtual jboolean isSubregion();
+  virtual ::java::lang::String * getName();
+  virtual ::java::lang::String * toString();
+  static ::javax::swing::plaf::synth::Region * ARROW_BUTTON;
+  static ::javax::swing::plaf::synth::Region * BUTTON;
+  static ::javax::swing::plaf::synth::Region * CHECK_BOX;
+  static ::javax::swing::plaf::synth::Region * CHECK_BOX_MENU_ITEM;
+  static ::javax::swing::plaf::synth::Region * COLOR_CHOOSER;
+  static ::javax::swing::plaf::synth::Region * COMBO_BOX;
+  static ::javax::swing::plaf::synth::Region * DESKTOP_PANE;
+  static ::javax::swing::plaf::synth::Region * DESKTOP_ICON;
+  static ::javax::swing::plaf::synth::Region * EDITOR_PANE;
+  static ::javax::swing::plaf::synth::Region * FILE_CHOOSER;
+  static ::javax::swing::plaf::synth::Region * FORMATTED_TEXT_FIELD;
+  static ::javax::swing::plaf::synth::Region * INTERNAL_FRAME;
+  static ::javax::swing::plaf::synth::Region * INTERNAL_FRAME_TITLE_PANE;
+  static ::javax::swing::plaf::synth::Region * LABEL;
+  static ::javax::swing::plaf::synth::Region * LIST;
+  static ::javax::swing::plaf::synth::Region * MENU;
+  static ::javax::swing::plaf::synth::Region * MENU_BAR;
+  static ::javax::swing::plaf::synth::Region * MENU_ITEM;
+  static ::javax::swing::plaf::synth::Region * MENU_ITEM_ACCELERATOR;
+  static ::javax::swing::plaf::synth::Region * OPTION_PANE;
+  static ::javax::swing::plaf::synth::Region * PANEL;
+  static ::javax::swing::plaf::synth::Region * PASSWORD_FIELD;
+  static ::javax::swing::plaf::synth::Region * POPUP_MENU;
+  static ::javax::swing::plaf::synth::Region * POPUP_MENU_SEPARATOR;
+  static ::javax::swing::plaf::synth::Region * PROGRESS_BAR;
+  static ::javax::swing::plaf::synth::Region * RADIO_BUTTON;
+  static ::javax::swing::plaf::synth::Region * RADIO_BUTTON_MENU_ITEM;
+  static ::javax::swing::plaf::synth::Region * ROOT_PANE;
+  static ::javax::swing::plaf::synth::Region * SCROLL_BAR;
+  static ::javax::swing::plaf::synth::Region * SCROLL_BAR_TRACK;
+  static ::javax::swing::plaf::synth::Region * SCROLL_BAR_THUMB;
+  static ::javax::swing::plaf::synth::Region * SCROLL_PANE;
+  static ::javax::swing::plaf::synth::Region * SEPARATOR;
+  static ::javax::swing::plaf::synth::Region * SLIDER;
+  static ::javax::swing::plaf::synth::Region * SLIDER_TRACK;
+  static ::javax::swing::plaf::synth::Region * SLIDER_THUMB;
+  static ::javax::swing::plaf::synth::Region * SPINNER;
+  static ::javax::swing::plaf::synth::Region * SPLIT_PANE;
+  static ::javax::swing::plaf::synth::Region * SPLIT_PANE_DIVIDER;
+  static ::javax::swing::plaf::synth::Region * TABBED_PANE;
+  static ::javax::swing::plaf::synth::Region * TABBED_PANE_TAB;
+  static ::javax::swing::plaf::synth::Region * TABBED_PANE_TAB_AREA;
+  static ::javax::swing::plaf::synth::Region * TABBED_PANE_CONTENT;
+  static ::javax::swing::plaf::synth::Region * TABLE;
+  static ::javax::swing::plaf::synth::Region * TABLE_HEADER;
+  static ::javax::swing::plaf::synth::Region * TEXT_AREA;
+  static ::javax::swing::plaf::synth::Region * TEXT_FIELD;
+  static ::javax::swing::plaf::synth::Region * TEXT_PANE;
+  static ::javax::swing::plaf::synth::Region * TOGGLE_BUTTON;
+  static ::javax::swing::plaf::synth::Region * TOOL_BAR;
+  static ::javax::swing::plaf::synth::Region * TOOL_BAR_CONTENT;
+  static ::javax::swing::plaf::synth::Region * TOOL_BAR_DRAG_WINDOW;
+  static ::javax::swing::plaf::synth::Region * TOOL_TIP;
+  static ::javax::swing::plaf::synth::Region * TOOL_BAR_SEPARATOR;
+  static ::javax::swing::plaf::synth::Region * TREE;
+  static ::javax::swing::plaf::synth::Region * TREE_CELL;
+  static ::javax::swing::plaf::synth::Region * VIEWPORT;
+public: // actually package-private
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) ui;
+private:
+  ::java::lang::String * name;
+  jboolean subregion;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_synth_Region__
diff --git a/libjava/javax/swing/plaf/synth/SynthConstants.h b/libjava/javax/swing/plaf/synth/SynthConstants.h
new file mode 100644
index 000000000..a6ae6deb8
--- /dev/null
+++ b/libjava/javax/swing/plaf/synth/SynthConstants.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_synth_SynthConstants__
+#define __javax_swing_plaf_synth_SynthConstants__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace synth
+        {
+            class SynthConstants;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::synth::SynthConstants : public ::java::lang::Object
+{
+
+public:
+  static const jint ENABLED = 1;
+  static const jint DISABLED = 8;
+  static const jint MOUSE_OVER = 2;
+  static const jint PRESSED = 4;
+  static const jint FOCUSED = 256;
+  static const jint SELECTED = 512;
+  static const jint DEFAULT = 1024;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_plaf_synth_SynthConstants__
diff --git a/libjava/javax/swing/plaf/synth/SynthContext.h b/libjava/javax/swing/plaf/synth/SynthContext.h
new file mode 100644
index 000000000..7e2eadb6d
--- /dev/null
+++ b/libjava/javax/swing/plaf/synth/SynthContext.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_synth_SynthContext__
+#define __javax_swing_plaf_synth_SynthContext__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+        namespace synth
+        {
+            class Region;
+            class SynthContext;
+            class SynthStyle;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::synth::SynthContext : public ::java::lang::Object
+{
+
+public:
+  SynthContext(::javax::swing::JComponent *, ::javax::swing::plaf::synth::Region *, ::javax::swing::plaf::synth::SynthStyle *, jint);
+  virtual ::javax::swing::JComponent * getComponent();
+  virtual ::javax::swing::plaf::synth::Region * getRegion();
+  virtual ::javax::swing::plaf::synth::SynthStyle * getStyle();
+  virtual jint getComponentState();
+private:
+  ::javax::swing::JComponent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) component;
+  ::javax::swing::plaf::synth::Region * region;
+  ::javax::swing::plaf::synth::SynthStyle * style;
+  jint state;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_synth_SynthContext__
diff --git a/libjava/javax/swing/plaf/synth/SynthGraphicsUtils.h b/libjava/javax/swing/plaf/synth/SynthGraphicsUtils.h
new file mode 100644
index 000000000..36c09c1a0
--- /dev/null
+++ b/libjava/javax/swing/plaf/synth/SynthGraphicsUtils.h
@@ -0,0 +1,58 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_synth_SynthGraphicsUtils__
+#define __javax_swing_plaf_synth_SynthGraphicsUtils__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Font;
+        class FontMetrics;
+        class Graphics;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+      namespace plaf
+      {
+        namespace synth
+        {
+            class SynthContext;
+            class SynthGraphicsUtils;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::synth::SynthGraphicsUtils : public ::java::lang::Object
+{
+
+public:
+  SynthGraphicsUtils();
+  virtual void drawLine(::javax::swing::plaf::synth::SynthContext *, ::java::lang::Object *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual ::java::lang::String * layoutText(::javax::swing::plaf::synth::SynthContext *, ::java::awt::FontMetrics *, ::java::lang::String *, ::javax::swing::Icon *, jint, jint, jint, jint, ::java::awt::Rectangle *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, jint);
+  virtual jint computeStringWidth(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Font *, ::java::awt::FontMetrics *, ::java::lang::String *);
+  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Font *, ::java::lang::String *, ::javax::swing::Icon *, jint, jint, jint, jint, jint, jint);
+  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Font *, ::java::lang::String *, ::javax::swing::Icon *, jint, jint, jint, jint, jint, jint);
+  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Font *, ::java::lang::String *, ::javax::swing::Icon *, jint, jint, jint, jint, jint, jint);
+  virtual jint getMaximumCharHeight(::javax::swing::plaf::synth::SynthContext *);
+  virtual void paintText(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, ::java::lang::String *, ::java::awt::Rectangle *, jint);
+  virtual void paintText(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, ::java::lang::String *, jint, jint, jint);
+  virtual void paintText(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, ::java::lang::String *, ::javax::swing::Icon *, jint, jint, jint, jint, jint, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_synth_SynthGraphicsUtils__
diff --git a/libjava/javax/swing/plaf/synth/SynthLookAndFeel.h b/libjava/javax/swing/plaf/synth/SynthLookAndFeel.h
new file mode 100644
index 000000000..d0b40a878
--- /dev/null
+++ b/libjava/javax/swing/plaf/synth/SynthLookAndFeel.h
@@ -0,0 +1,67 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_synth_SynthLookAndFeel__
+#define __javax_swing_plaf_synth_SynthLookAndFeel__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicLookAndFeel.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+        class UIDefaults;
+      namespace plaf
+      {
+          class ComponentUI;
+        namespace synth
+        {
+            class Region;
+            class SynthLookAndFeel;
+            class SynthStyle;
+            class SynthStyleFactory;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::synth::SynthLookAndFeel : public ::javax::swing::plaf::basic::BasicLookAndFeel
+{
+
+public:
+  SynthLookAndFeel();
+  static void setStyleFactory(::javax::swing::plaf::synth::SynthStyleFactory *);
+  static ::javax::swing::plaf::synth::SynthStyleFactory * getStyleFactory();
+  static ::javax::swing::plaf::synth::SynthStyle * getStyle(::javax::swing::JComponent *, ::javax::swing::plaf::synth::Region *);
+  static void updateStyles(::java::awt::Component *);
+  static ::javax::swing::plaf::synth::Region * getRegion(::javax::swing::JComponent *);
+  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
+  virtual void initialize();
+  virtual void uninitialize();
+  virtual ::javax::swing::UIDefaults * getDefaults();
+  virtual jboolean shouldUpdateStyleOnAncestorChanged();
+  virtual void load(::java::io::InputStream *, ::java::lang::Class *);
+  virtual ::java::lang::String * getDescription();
+  virtual ::java::lang::String * getID();
+  virtual ::java::lang::String * getName();
+  virtual jboolean isNativeLookAndFeel();
+  virtual jboolean isSupportedLookAndFeel();
+private:
+  static ::javax::swing::plaf::synth::SynthStyleFactory * styleFactory;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_synth_SynthLookAndFeel__
diff --git a/libjava/javax/swing/plaf/synth/SynthPainter.h b/libjava/javax/swing/plaf/synth/SynthPainter.h
new file mode 100644
index 000000000..23172a0ad
--- /dev/null
+++ b/libjava/javax/swing/plaf/synth/SynthPainter.h
@@ -0,0 +1,156 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_synth_SynthPainter__
+#define __javax_swing_plaf_synth_SynthPainter__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace plaf
+      {
+        namespace synth
+        {
+            class SynthContext;
+            class SynthPainter;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::synth::SynthPainter : public ::java::lang::Object
+{
+
+public:
+  SynthPainter();
+  virtual void paintArrowButtonForeground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
+  virtual void paintProgressBarForeground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
+  virtual void paintSeparatorForeground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
+  virtual void paintSplitPaneDividerForeground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
+  virtual void paintSplitPaneDragDivider(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
+  virtual void paintTreeCellFocus(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintArrowButtonBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintArrowButtonBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintButtonBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintButtonBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintCheckBoxBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintCheckBoxBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintCheckBoxMenuItemBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintCheckBoxMenuItemBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintColorChooserBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintColorChooserBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintComboBoxBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintComboBoxBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintDesktopIconBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintDesktopIconBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintDesktopPaneBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintDesktopPaneBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintEditorPaneBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintEditorPaneBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintFileChooserBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintFileChooserBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintFormattedTextFieldBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintFormattedTextFieldBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintInternalFrameBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintInternalFrameBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintInternalFrameTitlePaneBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintInternalFrameTitlePaneBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintLabelBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintLabelBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintListBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintListBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintMenuBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintMenuBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintMenuBarBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintMenuBarBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintMenuItemBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintMenuItemBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintOptionPaneBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintOptionPaneBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintPanelBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintPanelBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintPasswordFieldBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintPasswordFieldBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintPopupMenuBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintPopupMenuBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintProgressBarBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintProgressBarBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintRadioButtonBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintRadioButtonBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintRadioButtonMenuItemBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintRadioButtonMenuItemBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintRootPaneBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintRootPaneBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintScrollBarBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintScrollBarBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintScrollBarThumbBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
+  virtual void paintScrollBarThumbBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
+  virtual void paintScrollBarTrackBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintScrollBarTrackBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintScrollPaneBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintScrollPaneBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintSeparatorBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintSeparatorBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintSliderBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintSliderBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintSliderThumbBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
+  virtual void paintSliderThumbBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
+  virtual void paintSliderTrackBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintSliderTrackBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintSpinnerBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintSpinnerBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintSplitPaneBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintSplitPaneBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintSplitPaneDividerBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTabbedPaneBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTabbedPaneBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTabbedPaneContentBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTabbedPaneContentBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTabbedPaneTabAreaBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTabbedPaneTabAreaBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTabbedPaneTabBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
+  virtual void paintTabbedPaneTabBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
+  virtual void paintTableBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTableBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTableHeaderBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTableHeaderBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTextAreaBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTextAreaBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTextFieldBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTextFieldBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTextPaneBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTextPaneBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintToggleButtonBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintToggleButtonBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintToolBarBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintToolBarBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintToolBarContentBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintToolBarContentBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintToolBarDragWindowBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintToolBarDragWindowBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintToolTipBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintToolTipBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTreeBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTreeBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTreeCellBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintTreeCellBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintViewportBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void paintViewportBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_synth_SynthPainter__
diff --git a/libjava/javax/swing/plaf/synth/SynthStyle.h b/libjava/javax/swing/plaf/synth/SynthStyle.h
new file mode 100644
index 000000000..b8779f2b3
--- /dev/null
+++ b/libjava/javax/swing/plaf/synth/SynthStyle.h
@@ -0,0 +1,68 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_synth_SynthStyle__
+#define __javax_swing_plaf_synth_SynthStyle__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Font;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+      namespace plaf
+      {
+        namespace synth
+        {
+            class ColorType;
+            class SynthContext;
+            class SynthGraphicsUtils;
+            class SynthPainter;
+            class SynthStyle;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::synth::SynthStyle : public ::java::lang::Object
+{
+
+public:
+  SynthStyle();
+  virtual ::javax::swing::plaf::synth::SynthGraphicsUtils * getGraphicsUtils(::javax::swing::plaf::synth::SynthContext *);
+  virtual ::java::awt::Color * getColor(::javax::swing::plaf::synth::SynthContext *, ::javax::swing::plaf::synth::ColorType *);
+public: // actually protected
+  virtual ::java::awt::Color * getColorForState(::javax::swing::plaf::synth::SynthContext *, ::javax::swing::plaf::synth::ColorType *) = 0;
+public:
+  virtual ::java::awt::Font * getFont(::javax::swing::plaf::synth::SynthContext *);
+public: // actually protected
+  virtual ::java::awt::Font * getFontForState(::javax::swing::plaf::synth::SynthContext *) = 0;
+public:
+  virtual ::java::awt::Insets * getInsets(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Insets *);
+  virtual ::javax::swing::plaf::synth::SynthPainter * getPainter(::javax::swing::plaf::synth::SynthContext *);
+  virtual jboolean isOpaque(::javax::swing::plaf::synth::SynthContext *);
+  virtual ::java::lang::Object * get(::javax::swing::plaf::synth::SynthContext *, ::java::lang::Object *);
+  virtual void installDefaults(::javax::swing::plaf::synth::SynthContext *);
+  virtual void uninstallDefaults(::javax::swing::plaf::synth::SynthContext *);
+  virtual jint getInt(::javax::swing::plaf::synth::SynthContext *, ::java::lang::Object *, jint);
+  virtual jboolean getBoolean(::javax::swing::plaf::synth::SynthContext *, ::java::lang::Object *, jboolean);
+  virtual ::javax::swing::Icon * getIcon(::javax::swing::plaf::synth::SynthContext *, ::java::lang::Object *);
+  virtual ::java::lang::String * getString(::javax::swing::plaf::synth::SynthContext *, ::java::lang::Object *, ::java::lang::String *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_synth_SynthStyle__
diff --git a/libjava/javax/swing/plaf/synth/SynthStyleFactory.h b/libjava/javax/swing/plaf/synth/SynthStyleFactory.h
new file mode 100644
index 000000000..2f6905676
--- /dev/null
+++ b/libjava/javax/swing/plaf/synth/SynthStyleFactory.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_plaf_synth_SynthStyleFactory__
+#define __javax_swing_plaf_synth_SynthStyleFactory__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace plaf
+      {
+        namespace synth
+        {
+            class Region;
+            class SynthStyle;
+            class SynthStyleFactory;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::plaf::synth::SynthStyleFactory : public ::java::lang::Object
+{
+
+public:
+  SynthStyleFactory();
+  virtual ::javax::swing::plaf::synth::SynthStyle * getStyle(::javax::swing::JComponent *, ::javax::swing::plaf::synth::Region *) = 0;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_plaf_synth_SynthStyleFactory__
diff --git a/libjava/javax/swing/table/AbstractTableModel.h b/libjava/javax/swing/table/AbstractTableModel.h
new file mode 100644
index 000000000..307aa95f9
--- /dev/null
+++ b/libjava/javax/swing/table/AbstractTableModel.h
@@ -0,0 +1,64 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_table_AbstractTableModel__
+#define __javax_swing_table_AbstractTableModel__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class EventListenerList;
+          class TableModelEvent;
+          class TableModelListener;
+      }
+      namespace table
+      {
+          class AbstractTableModel;
+      }
+    }
+  }
+}
+
+class javax::swing::table::AbstractTableModel : public ::java::lang::Object
+{
+
+public:
+  AbstractTableModel();
+  virtual ::java::lang::String * getColumnName(jint);
+  virtual jint findColumn(::java::lang::String *);
+  virtual ::java::lang::Class * getColumnClass(jint);
+  virtual jboolean isCellEditable(jint, jint);
+  virtual void setValueAt(::java::lang::Object *, jint, jint);
+  virtual void addTableModelListener(::javax::swing::event::TableModelListener *);
+  virtual void removeTableModelListener(::javax::swing::event::TableModelListener *);
+  virtual JArray< ::javax::swing::event::TableModelListener * > * getTableModelListeners();
+  virtual void fireTableDataChanged();
+  virtual void fireTableStructureChanged();
+  virtual void fireTableRowsInserted(jint, jint);
+  virtual void fireTableRowsUpdated(jint, jint);
+  virtual void fireTableRowsDeleted(jint, jint);
+  virtual void fireTableCellUpdated(jint, jint);
+  virtual void fireTableChanged(::javax::swing::event::TableModelEvent *);
+  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
+  virtual jint getRowCount() = 0;
+  virtual jint getColumnCount() = 0;
+  virtual ::java::lang::Object * getValueAt(jint, jint) = 0;
+public: // actually package-private
+  static const jlong serialVersionUID = -5798593159423650347LL;
+public: // actually protected
+  ::javax::swing::event::EventListenerList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) listenerList;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_table_AbstractTableModel__
diff --git a/libjava/javax/swing/table/DefaultTableCellRenderer$UIResource.h b/libjava/javax/swing/table/DefaultTableCellRenderer$UIResource.h
new file mode 100644
index 000000000..ba101048b
--- /dev/null
+++ b/libjava/javax/swing/table/DefaultTableCellRenderer$UIResource.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_table_DefaultTableCellRenderer$UIResource__
+#define __javax_swing_table_DefaultTableCellRenderer$UIResource__
+
+#pragma interface
+
+#include <javax/swing/table/DefaultTableCellRenderer.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace table
+      {
+          class DefaultTableCellRenderer$UIResource;
+      }
+    }
+  }
+}
+
+class javax::swing::table::DefaultTableCellRenderer$UIResource : public ::javax::swing::table::DefaultTableCellRenderer
+{
+
+public:
+  DefaultTableCellRenderer$UIResource();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_table_DefaultTableCellRenderer$UIResource__
diff --git a/libjava/javax/swing/table/DefaultTableCellRenderer.h b/libjava/javax/swing/table/DefaultTableCellRenderer.h
new file mode 100644
index 000000000..7865b5a4a
--- /dev/null
+++ b/libjava/javax/swing/table/DefaultTableCellRenderer.h
@@ -0,0 +1,69 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_table_DefaultTableCellRenderer__
+#define __javax_swing_table_DefaultTableCellRenderer__
+
+#pragma interface
+
+#include <javax/swing/JLabel.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JTable;
+      namespace border
+      {
+          class Border;
+      }
+      namespace table
+      {
+          class DefaultTableCellRenderer;
+      }
+    }
+  }
+}
+
+class javax::swing::table::DefaultTableCellRenderer : public ::javax::swing::JLabel
+{
+
+public:
+  DefaultTableCellRenderer();
+  virtual void setForeground(::java::awt::Color *);
+  virtual void setBackground(::java::awt::Color *);
+  virtual void updateUI();
+  virtual ::java::awt::Component * getTableCellRendererComponent(::javax::swing::JTable *, ::java::lang::Object *, jboolean, jboolean, jint, jint);
+  virtual jboolean isOpaque();
+  virtual void validate();
+  virtual void revalidate();
+  virtual void repaint(jlong, jint, jint, jint, jint);
+  virtual void repaint(::java::awt::Rectangle *);
+public: // actually protected
+  virtual void firePropertyChange(::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *);
+public:
+  virtual void firePropertyChange(::java::lang::String *, jboolean, jboolean);
+public: // actually protected
+  virtual void setValue(::java::lang::Object *);
+public: // actually package-private
+  static const jlong serialVersionUID = 7878911414715528324LL;
+public: // actually protected
+  static ::javax::swing::border::Border * noFocusBorder;
+public: // actually package-private
+  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::JLabel)))) foreground;
+  ::java::awt::Color * background;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_table_DefaultTableCellRenderer__
diff --git a/libjava/javax/swing/table/DefaultTableColumnModel.h b/libjava/javax/swing/table/DefaultTableColumnModel.h
new file mode 100644
index 000000000..bdbb4e775
--- /dev/null
+++ b/libjava/javax/swing/table/DefaultTableColumnModel.h
@@ -0,0 +1,96 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_table_DefaultTableColumnModel__
+#define __javax_swing_table_DefaultTableColumnModel__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class ListSelectionModel;
+      namespace event
+      {
+          class ChangeEvent;
+          class EventListenerList;
+          class ListSelectionEvent;
+          class TableColumnModelEvent;
+          class TableColumnModelListener;
+      }
+      namespace table
+      {
+          class DefaultTableColumnModel;
+          class TableColumn;
+      }
+    }
+  }
+}
+
+class javax::swing::table::DefaultTableColumnModel : public ::java::lang::Object
+{
+
+public:
+  DefaultTableColumnModel();
+  virtual void addColumn(::javax::swing::table::TableColumn *);
+  virtual void removeColumn(::javax::swing::table::TableColumn *);
+  virtual void moveColumn(jint, jint);
+  virtual void setColumnMargin(jint);
+  virtual jint getColumnCount();
+  virtual ::java::util::Enumeration * getColumns();
+  virtual jint getColumnIndex(::java::lang::Object *);
+  virtual ::javax::swing::table::TableColumn * getColumn(jint);
+  virtual jint getColumnMargin();
+  virtual jint getColumnIndexAtX(jint);
+  virtual jint getTotalColumnWidth();
+  virtual void setSelectionModel(::javax::swing::ListSelectionModel *);
+  virtual ::javax::swing::ListSelectionModel * getSelectionModel();
+  virtual void setColumnSelectionAllowed(jboolean);
+  virtual jboolean getColumnSelectionAllowed();
+  virtual JArray< jint > * getSelectedColumns();
+  virtual jint getSelectedColumnCount();
+  virtual void addColumnModelListener(::javax::swing::event::TableColumnModelListener *);
+  virtual void removeColumnModelListener(::javax::swing::event::TableColumnModelListener *);
+  virtual JArray< ::javax::swing::event::TableColumnModelListener * > * getColumnModelListeners();
+public: // actually protected
+  virtual void fireColumnAdded(::javax::swing::event::TableColumnModelEvent *);
+  virtual void fireColumnRemoved(::javax::swing::event::TableColumnModelEvent *);
+  virtual void fireColumnMoved(::javax::swing::event::TableColumnModelEvent *);
+  virtual void fireColumnSelectionChanged(::javax::swing::event::ListSelectionEvent *);
+  virtual void fireColumnMarginChanged();
+public:
+  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *);
+public: // actually protected
+  virtual ::javax::swing::ListSelectionModel * createSelectionModel();
+  virtual void recalcWidthCache();
+private:
+  void invalidateWidthCache();
+  static const jlong serialVersionUID = 6580012493508960512LL;
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) tableColumns;
+  ::javax::swing::ListSelectionModel * selectionModel;
+  jint columnMargin;
+  ::javax::swing::event::EventListenerList * listenerList;
+  ::javax::swing::event::ChangeEvent * changeEvent;
+  jboolean columnSelectionAllowed;
+  jint totalColumnWidth;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_table_DefaultTableColumnModel__
diff --git a/libjava/javax/swing/table/DefaultTableModel.h b/libjava/javax/swing/table/DefaultTableModel.h
new file mode 100644
index 000000000..a5f3bd4ec
--- /dev/null
+++ b/libjava/javax/swing/table/DefaultTableModel.h
@@ -0,0 +1,81 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_table_DefaultTableModel__
+#define __javax_swing_table_DefaultTableModel__
+
+#pragma interface
+
+#include <javax/swing/table/AbstractTableModel.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class TableModelEvent;
+      }
+      namespace table
+      {
+          class DefaultTableModel;
+      }
+    }
+  }
+}
+
+class javax::swing::table::DefaultTableModel : public ::javax::swing::table::AbstractTableModel
+{
+
+public:
+  DefaultTableModel();
+  DefaultTableModel(jint, jint);
+  DefaultTableModel(::java::util::Vector *, jint);
+  DefaultTableModel(JArray< ::java::lang::Object * > *, jint);
+  DefaultTableModel(::java::util::Vector *, ::java::util::Vector *);
+  DefaultTableModel(JArray< JArray< ::java::lang::Object * > * > *, JArray< ::java::lang::Object * > *);
+  virtual ::java::util::Vector * getDataVector();
+  virtual void setDataVector(::java::util::Vector *, ::java::util::Vector *);
+  virtual void setDataVector(JArray< JArray< ::java::lang::Object * > * > *, JArray< ::java::lang::Object * > *);
+  virtual void newDataAvailable(::javax::swing::event::TableModelEvent *);
+  virtual void newRowsAdded(::javax::swing::event::TableModelEvent *);
+  virtual void rowsRemoved(::javax::swing::event::TableModelEvent *);
+  virtual void setColumnIdentifiers(::java::util::Vector *);
+  virtual void setColumnIdentifiers(JArray< ::java::lang::Object * > *);
+  virtual void setNumRows(jint);
+  virtual void setRowCount(jint);
+  virtual void setColumnCount(jint);
+  virtual void addColumn(::java::lang::Object *);
+  virtual void addColumn(::java::lang::Object *, ::java::util::Vector *);
+  virtual void addColumn(::java::lang::Object *, JArray< ::java::lang::Object * > *);
+  virtual void addRow(::java::util::Vector *);
+  virtual void addRow(JArray< ::java::lang::Object * > *);
+  virtual void insertRow(jint, ::java::util::Vector *);
+  virtual void insertRow(jint, JArray< ::java::lang::Object * > *);
+  virtual void moveRow(jint, jint, jint);
+  virtual void removeRow(jint);
+  virtual jint getRowCount();
+  virtual jint getColumnCount();
+  virtual ::java::lang::String * getColumnName(jint);
+  virtual jboolean isCellEditable(jint, jint);
+  virtual ::java::lang::Object * getValueAt(jint, jint);
+  virtual void setValueAt(::java::lang::Object *, jint, jint);
+public: // actually protected
+  static ::java::util::Vector * convertToVector(JArray< ::java::lang::Object * > *);
+  static ::java::util::Vector * convertToVector(JArray< JArray< ::java::lang::Object * > * > *);
+private:
+  void addExtraRows(jint, jint);
+  void checkSize();
+public: // actually package-private
+  static const jlong serialVersionUID = 6680042567037222321LL;
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::table::AbstractTableModel)))) dataVector;
+  ::java::util::Vector * columnIdentifiers;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_table_DefaultTableModel__
diff --git a/libjava/javax/swing/table/JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry.h b/libjava/javax/swing/table/JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry.h
new file mode 100644
index 000000000..c5febbb2c
--- /dev/null
+++ b/libjava/javax/swing/table/JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry.h
@@ -0,0 +1,125 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_table_JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry__
+#define __javax_swing_table_JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry__
+
+#pragma interface
+
+#include <javax/accessibility/AccessibleContext.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Cursor;
+        class Dimension;
+        class Font;
+        class FontMetrics;
+        class Point;
+        class Rectangle;
+      namespace event
+      {
+          class FocusListener;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+        class AccessibleAction;
+        class AccessibleComponent;
+        class AccessibleContext;
+        class AccessibleRole;
+        class AccessibleSelection;
+        class AccessibleStateSet;
+        class AccessibleText;
+        class AccessibleValue;
+    }
+    namespace swing
+    {
+        class JTable;
+      namespace table
+      {
+          class JTableHeader;
+          class JTableHeader$AccessibleJTableHeader;
+          class JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry;
+      }
+    }
+  }
+}
+
+class javax::swing::table::JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry : public ::javax::accessibility::AccessibleContext
+{
+
+public:
+  JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry(::javax::swing::table::JTableHeader$AccessibleJTableHeader *, jint, ::javax::swing::table::JTableHeader *, ::javax::swing::JTable *);
+public: // actually package-private
+  virtual ::java::awt::Component * getColumnHeaderRenderer();
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleColumnHeaderRenderer();
+public:
+  virtual void addFocusListener(::java::awt::event::FocusListener *);
+  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
+  virtual jboolean contains(::java::awt::Point *);
+  virtual ::javax::accessibility::AccessibleAction * getAccessibleAction();
+  virtual ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Point *);
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
+  virtual jint getAccessibleChildrenCount();
+  virtual ::javax::accessibility::AccessibleComponent * getAccessibleComponent();
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+  virtual ::java::lang::String * getAccessibleDescription();
+  virtual jint getAccessibleIndexInParent();
+  virtual ::java::lang::String * getAccessibleName();
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+  virtual ::javax::accessibility::AccessibleSelection * getAccessibleSelection();
+  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
+  virtual ::javax::accessibility::AccessibleText * getAccessibleText();
+  virtual ::javax::accessibility::AccessibleValue * getAccessibleValue();
+  virtual ::java::awt::Color * getBackground();
+  virtual ::java::awt::Rectangle * getBounds();
+  virtual ::java::awt::Cursor * getCursor();
+  virtual ::java::awt::Font * getFont();
+  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
+  virtual ::java::awt::Color * getForeground();
+  virtual ::java::util::Locale * getLocale();
+  virtual ::java::awt::Point * getLocation();
+  virtual ::java::awt::Point * getLocationOnScreen();
+  virtual ::java::awt::Dimension * getSize();
+  virtual jboolean isEnabled();
+  virtual jboolean isFocusTraversable();
+  virtual jboolean isShowing();
+  virtual jboolean isVisible();
+  virtual void removeFocusListener(::java::awt::event::FocusListener *);
+  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
+  virtual void requestFocus();
+  virtual void setAccessibleDescription(::java::lang::String *);
+  virtual void setAccessibleName(::java::lang::String *);
+  virtual void setBackground(::java::awt::Color *);
+  virtual void setBounds(::java::awt::Rectangle *);
+  virtual void setCursor(::java::awt::Cursor *);
+  virtual void setEnabled(jboolean);
+  virtual void setFont(::java::awt::Font *);
+  virtual void setForeground(::java::awt::Color *);
+  virtual void setLocation(::java::awt::Point *);
+  virtual void setSize(::java::awt::Dimension *);
+  virtual void setVisible(jboolean);
+private:
+  jint __attribute__((aligned(__alignof__( ::javax::accessibility::AccessibleContext)))) columnIndex;
+  ::javax::swing::table::JTableHeader * parent;
+  ::javax::swing::JTable * table;
+public: // actually package-private
+  ::javax::swing::table::JTableHeader$AccessibleJTableHeader * this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_table_JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry__
diff --git a/libjava/javax/swing/table/JTableHeader$AccessibleJTableHeader.h b/libjava/javax/swing/table/JTableHeader$AccessibleJTableHeader.h
new file mode 100644
index 000000000..64fd44e71
--- /dev/null
+++ b/libjava/javax/swing/table/JTableHeader$AccessibleJTableHeader.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_table_JTableHeader$AccessibleJTableHeader__
+#define __javax_swing_table_JTableHeader$AccessibleJTableHeader__
+
+#pragma interface
+
+#include <javax/swing/JComponent$AccessibleJComponent.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Point;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class Accessible;
+        class AccessibleRole;
+    }
+    namespace swing
+    {
+      namespace table
+      {
+          class JTableHeader;
+          class JTableHeader$AccessibleJTableHeader;
+      }
+    }
+  }
+}
+
+class javax::swing::table::JTableHeader$AccessibleJTableHeader : public ::javax::swing::JComponent$AccessibleJComponent
+{
+
+public: // actually protected
+  JTableHeader$AccessibleJTableHeader(::javax::swing::table::JTableHeader *);
+public:
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+  virtual jint getAccessibleChildrenCount();
+  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
+  virtual ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Point *);
+public: // actually package-private
+  ::javax::swing::table::JTableHeader * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_table_JTableHeader$AccessibleJTableHeader__
diff --git a/libjava/javax/swing/table/JTableHeader.h b/libjava/javax/swing/table/JTableHeader.h
new file mode 100644
index 000000000..0c92ad30a
--- /dev/null
+++ b/libjava/javax/swing/table/JTableHeader.h
@@ -0,0 +1,120 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_table_JTableHeader__
+#define __javax_swing_table_JTableHeader__
+
+#pragma interface
+
+#include <javax/swing/JComponent.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Point;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class JTable;
+      namespace event
+      {
+          class ChangeEvent;
+          class ListSelectionEvent;
+          class TableColumnModelEvent;
+      }
+      namespace plaf
+      {
+          class TableHeaderUI;
+      }
+      namespace table
+      {
+          class JTableHeader;
+          class TableCellRenderer;
+          class TableColumn;
+          class TableColumnModel;
+      }
+    }
+  }
+}
+
+class javax::swing::table::JTableHeader : public ::javax::swing::JComponent
+{
+
+public:
+  JTableHeader();
+  JTableHeader(::javax::swing::table::TableColumnModel *);
+public: // actually protected
+  virtual ::javax::swing::table::TableColumnModel * createDefaultColumnModel();
+public:
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+  virtual ::javax::swing::table::TableColumnModel * getColumnModel();
+  virtual ::javax::swing::table::TableColumn * getDraggedColumn();
+  virtual jint getDraggedDistance();
+  virtual jboolean getReorderingAllowed();
+  virtual jboolean getResizingAllowed();
+  virtual ::javax::swing::table::TableColumn * getResizingColumn();
+  virtual ::javax::swing::JTable * getTable();
+  virtual jboolean getUpdateTableInRealTime();
+  virtual jboolean isOpaque();
+  virtual void setColumnModel(::javax::swing::table::TableColumnModel *);
+  virtual void setDraggedColumn(::javax::swing::table::TableColumn *);
+  virtual void setDraggedDistance(jint);
+  virtual void setOpaque(jboolean);
+  virtual void setReorderingAllowed(jboolean);
+  virtual void setResizingAllowed(jboolean);
+  virtual void setResizingColumn(::javax::swing::table::TableColumn *);
+  virtual void setTable(::javax::swing::JTable *);
+  virtual void setUpdateTableInRealTime(jboolean);
+public: // actually protected
+  virtual ::javax::swing::table::TableCellRenderer * createDefaultRenderer();
+public:
+  virtual ::javax::swing::table::TableCellRenderer * getDefaultRenderer();
+  virtual void setDefaultRenderer(::javax::swing::table::TableCellRenderer *);
+  virtual ::java::awt::Rectangle * getHeaderRect(jint);
+public: // actually protected
+  virtual ::java::lang::String * paramString();
+public:
+  virtual ::java::lang::String * getUIClassID();
+  virtual ::javax::swing::plaf::TableHeaderUI * getUI();
+  virtual void setUI(::javax::swing::plaf::TableHeaderUI *);
+  virtual void updateUI();
+  virtual jint columnAtPoint(::java::awt::Point *);
+  virtual void columnAdded(::javax::swing::event::TableColumnModelEvent *);
+  virtual void columnMarginChanged(::javax::swing::event::ChangeEvent *);
+  virtual void columnMoved(::javax::swing::event::TableColumnModelEvent *);
+  virtual void columnRemoved(::javax::swing::event::TableColumnModelEvent *);
+  virtual void columnSelectionChanged(::javax::swing::event::ListSelectionEvent *);
+  virtual void resizeAndRepaint();
+public: // actually protected
+  virtual void initializeLocalVars();
+private:
+  static const jlong serialVersionUID = 5144633983372967710LL;
+public: // actually protected
+  ::javax::swing::table::TableColumnModel * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) columnModel;
+  ::javax::swing::table::TableColumn * draggedColumn;
+  jint draggedDistance;
+public: // actually package-private
+  jboolean opaque;
+public: // actually protected
+  jboolean reorderingAllowed;
+  jboolean resizingAllowed;
+  ::javax::swing::table::TableColumn * resizingColumn;
+  ::javax::swing::JTable * table;
+  jboolean updateTableInRealTime;
+public: // actually package-private
+  ::javax::swing::table::TableCellRenderer * cellRenderer;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_table_JTableHeader__
diff --git a/libjava/javax/swing/table/TableCellEditor.h b/libjava/javax/swing/table/TableCellEditor.h
new file mode 100644
index 000000000..a84088452
--- /dev/null
+++ b/libjava/javax/swing/table/TableCellEditor.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_table_TableCellEditor__
+#define __javax_swing_table_TableCellEditor__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JTable;
+      namespace event
+      {
+          class CellEditorListener;
+      }
+      namespace table
+      {
+          class TableCellEditor;
+      }
+    }
+  }
+}
+
+class javax::swing::table::TableCellEditor : public ::java::lang::Object
+{
+
+public:
+  virtual ::java::awt::Component * getTableCellEditorComponent(::javax::swing::JTable *, ::java::lang::Object *, jboolean, jint, jint) = 0;
+  virtual ::java::lang::Object * getCellEditorValue() = 0;
+  virtual jboolean isCellEditable(::java::util::EventObject *) = 0;
+  virtual jboolean shouldSelectCell(::java::util::EventObject *) = 0;
+  virtual jboolean stopCellEditing() = 0;
+  virtual void cancelCellEditing() = 0;
+  virtual void addCellEditorListener(::javax::swing::event::CellEditorListener *) = 0;
+  virtual void removeCellEditorListener(::javax::swing::event::CellEditorListener *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_table_TableCellEditor__
diff --git a/libjava/javax/swing/table/TableCellRenderer.h b/libjava/javax/swing/table/TableCellRenderer.h
new file mode 100644
index 000000000..46e7eff87
--- /dev/null
+++ b/libjava/javax/swing/table/TableCellRenderer.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_table_TableCellRenderer__
+#define __javax_swing_table_TableCellRenderer__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JTable;
+      namespace table
+      {
+          class TableCellRenderer;
+      }
+    }
+  }
+}
+
+class javax::swing::table::TableCellRenderer : public ::java::lang::Object
+{
+
+public:
+  virtual ::java::awt::Component * getTableCellRendererComponent(::javax::swing::JTable *, ::java::lang::Object *, jboolean, jboolean, jint, jint) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_table_TableCellRenderer__
diff --git a/libjava/javax/swing/table/TableColumn.h b/libjava/javax/swing/table/TableColumn.h
new file mode 100644
index 000000000..11ca5758b
--- /dev/null
+++ b/libjava/javax/swing/table/TableColumn.h
@@ -0,0 +1,105 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_table_TableColumn__
+#define __javax_swing_table_TableColumn__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class SwingPropertyChangeSupport;
+      }
+      namespace table
+      {
+          class TableCellEditor;
+          class TableCellRenderer;
+          class TableColumn;
+      }
+    }
+  }
+}
+
+class javax::swing::table::TableColumn : public ::java::lang::Object
+{
+
+public:
+  TableColumn();
+  TableColumn(jint);
+  TableColumn(jint, jint);
+  TableColumn(jint, jint, ::javax::swing::table::TableCellRenderer *, ::javax::swing::table::TableCellEditor *);
+  virtual void setModelIndex(jint);
+  virtual jint getModelIndex();
+  virtual void setIdentifier(::java::lang::Object *);
+  virtual ::java::lang::Object * getIdentifier();
+  virtual void setHeaderValue(::java::lang::Object *);
+  virtual ::java::lang::Object * getHeaderValue();
+  virtual void setHeaderRenderer(::javax::swing::table::TableCellRenderer *);
+  virtual ::javax::swing::table::TableCellRenderer * getHeaderRenderer();
+  virtual void setCellRenderer(::javax::swing::table::TableCellRenderer *);
+  virtual ::javax::swing::table::TableCellRenderer * getCellRenderer();
+  virtual void setCellEditor(::javax::swing::table::TableCellEditor *);
+  virtual ::javax::swing::table::TableCellEditor * getCellEditor();
+  virtual void setWidth(jint);
+  virtual jint getWidth();
+  virtual void setPreferredWidth(jint);
+  virtual jint getPreferredWidth();
+  virtual void setMinWidth(jint);
+  virtual jint getMinWidth();
+  virtual void setMaxWidth(jint);
+  virtual jint getMaxWidth();
+  virtual void setResizable(jboolean);
+  virtual jboolean getResizable();
+  virtual void sizeWidthToFit();
+  virtual void disableResizedPosting();
+  virtual void enableResizedPosting();
+  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
+  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
+  virtual JArray< ::java::beans::PropertyChangeListener * > * getPropertyChangeListeners();
+public: // actually protected
+  virtual ::javax::swing::table::TableCellRenderer * createDefaultHeaderRenderer();
+public: // actually package-private
+  static const jlong serialVersionUID = -6113660025878112608LL;
+public:
+  static ::java::lang::String * COLUMN_WIDTH_PROPERTY;
+  static ::java::lang::String * HEADER_VALUE_PROPERTY;
+  static ::java::lang::String * HEADER_RENDERER_PROPERTY;
+  static ::java::lang::String * CELL_RENDERER_PROPERTY;
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) modelIndex;
+  ::java::lang::Object * identifier;
+  jint width;
+  jint minWidth;
+private:
+  jint preferredWidth;
+public: // actually protected
+  jint maxWidth;
+  ::javax::swing::table::TableCellRenderer * headerRenderer;
+  ::java::lang::Object * headerValue;
+  ::javax::swing::table::TableCellRenderer * cellRenderer;
+  ::javax::swing::table::TableCellEditor * cellEditor;
+  jboolean isResizable;
+  jint resizedPostingDisableCount;
+private:
+  ::javax::swing::event::SwingPropertyChangeSupport * changeSupport;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_table_TableColumn__
diff --git a/libjava/javax/swing/table/TableColumnModel.h b/libjava/javax/swing/table/TableColumnModel.h
new file mode 100644
index 000000000..ea6032242
--- /dev/null
+++ b/libjava/javax/swing/table/TableColumnModel.h
@@ -0,0 +1,58 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_table_TableColumnModel__
+#define __javax_swing_table_TableColumnModel__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class ListSelectionModel;
+      namespace event
+      {
+          class TableColumnModelListener;
+      }
+      namespace table
+      {
+          class TableColumn;
+          class TableColumnModel;
+      }
+    }
+  }
+}
+
+class javax::swing::table::TableColumnModel : public ::java::lang::Object
+{
+
+public:
+  virtual void addColumn(::javax::swing::table::TableColumn *) = 0;
+  virtual void removeColumn(::javax::swing::table::TableColumn *) = 0;
+  virtual void moveColumn(jint, jint) = 0;
+  virtual void setColumnMargin(jint) = 0;
+  virtual jint getColumnCount() = 0;
+  virtual ::java::util::Enumeration * getColumns() = 0;
+  virtual jint getColumnIndex(::java::lang::Object *) = 0;
+  virtual ::javax::swing::table::TableColumn * getColumn(jint) = 0;
+  virtual jint getColumnMargin() = 0;
+  virtual jint getColumnIndexAtX(jint) = 0;
+  virtual jint getTotalColumnWidth() = 0;
+  virtual void setColumnSelectionAllowed(jboolean) = 0;
+  virtual jboolean getColumnSelectionAllowed() = 0;
+  virtual JArray< jint > * getSelectedColumns() = 0;
+  virtual jint getSelectedColumnCount() = 0;
+  virtual void setSelectionModel(::javax::swing::ListSelectionModel *) = 0;
+  virtual ::javax::swing::ListSelectionModel * getSelectionModel() = 0;
+  virtual void addColumnModelListener(::javax::swing::event::TableColumnModelListener *) = 0;
+  virtual void removeColumnModelListener(::javax::swing::event::TableColumnModelListener *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_table_TableColumnModel__
diff --git a/libjava/javax/swing/table/TableModel.h b/libjava/javax/swing/table/TableModel.h
new file mode 100644
index 000000000..29494c5e1
--- /dev/null
+++ b/libjava/javax/swing/table/TableModel.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_table_TableModel__
+#define __javax_swing_table_TableModel__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class TableModelListener;
+      }
+      namespace table
+      {
+          class TableModel;
+      }
+    }
+  }
+}
+
+class javax::swing::table::TableModel : public ::java::lang::Object
+{
+
+public:
+  virtual jint getRowCount() = 0;
+  virtual jint getColumnCount() = 0;
+  virtual ::java::lang::String * getColumnName(jint) = 0;
+  virtual ::java::lang::Class * getColumnClass(jint) = 0;
+  virtual jboolean isCellEditable(jint, jint) = 0;
+  virtual ::java::lang::Object * getValueAt(jint, jint) = 0;
+  virtual void setValueAt(::java::lang::Object *, jint, jint) = 0;
+  virtual void addTableModelListener(::javax::swing::event::TableModelListener *) = 0;
+  virtual void removeTableModelListener(::javax::swing::event::TableModelListener *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_table_TableModel__
diff --git a/libjava/javax/swing/text/AbstractDocument$AbstractElement.h b/libjava/javax/swing/text/AbstractDocument$AbstractElement.h
new file mode 100644
index 000000000..1aae4dc36
--- /dev/null
+++ b/libjava/javax/swing/text/AbstractDocument$AbstractElement.h
@@ -0,0 +1,83 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_AbstractDocument$AbstractElement__
+#define __javax_swing_text_AbstractDocument$AbstractElement__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AbstractDocument;
+          class AbstractDocument$AbstractElement;
+          class AttributeSet;
+          class Document;
+          class Element;
+      }
+      namespace tree
+      {
+          class TreeNode;
+      }
+    }
+  }
+}
+
+class javax::swing::text::AbstractDocument$AbstractElement : public ::java::lang::Object
+{
+
+public:
+  AbstractDocument$AbstractElement(::javax::swing::text::AbstractDocument *, ::javax::swing::text::Element *, ::javax::swing::text::AttributeSet *);
+  virtual ::java::util::Enumeration * children() = 0;
+  virtual jboolean getAllowsChildren() = 0;
+  virtual ::javax::swing::tree::TreeNode * getChildAt(jint);
+  virtual jint getChildCount();
+  virtual jint getIndex(::javax::swing::tree::TreeNode *);
+  virtual ::javax::swing::tree::TreeNode * getParent();
+  virtual jboolean isLeaf() = 0;
+  virtual void addAttribute(::java::lang::Object *, ::java::lang::Object *);
+  virtual void addAttributes(::javax::swing::text::AttributeSet *);
+  virtual void removeAttribute(::java::lang::Object *);
+  virtual void removeAttributes(::javax::swing::text::AttributeSet *);
+  virtual void removeAttributes(::java::util::Enumeration *);
+  virtual void setResolveParent(::javax::swing::text::AttributeSet *);
+  virtual jboolean containsAttribute(::java::lang::Object *, ::java::lang::Object *);
+  virtual jboolean containsAttributes(::javax::swing::text::AttributeSet *);
+  virtual ::javax::swing::text::AttributeSet * copyAttributes();
+  virtual ::java::lang::Object * getAttribute(::java::lang::Object *);
+  virtual jint getAttributeCount();
+  virtual ::java::util::Enumeration * getAttributeNames();
+  virtual ::javax::swing::text::AttributeSet * getResolveParent();
+  virtual jboolean isDefined(::java::lang::Object *);
+  virtual jboolean isEqual(::javax::swing::text::AttributeSet *);
+  virtual ::javax::swing::text::AttributeSet * getAttributes();
+  virtual ::javax::swing::text::Document * getDocument();
+  virtual ::javax::swing::text::Element * getElement(jint) = 0;
+  virtual ::java::lang::String * getName();
+  virtual ::javax::swing::text::Element * getParentElement();
+  virtual jint getEndOffset() = 0;
+  virtual jint getElementCount() = 0;
+  virtual jint getElementIndex(jint) = 0;
+  virtual jint getStartOffset() = 0;
+  virtual void dump(::java::io::PrintStream *, jint);
+private:
+  static const jlong serialVersionUID = 1712240033321461704LL;
+public: // actually package-private
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) count;
+  jint offset;
+  ::javax::swing::text::AttributeSet * attributes;
+  ::javax::swing::text::Element * element_parent;
+  ::javax::swing::tree::TreeNode * tree_parent;
+  ::java::util::Vector * tree_children;
+  ::javax::swing::text::AbstractDocument * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_AbstractDocument$AbstractElement__
diff --git a/libjava/javax/swing/text/AbstractDocument$AttributeContext.h b/libjava/javax/swing/text/AbstractDocument$AttributeContext.h
new file mode 100644
index 000000000..d02f88831
--- /dev/null
+++ b/libjava/javax/swing/text/AbstractDocument$AttributeContext.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_AbstractDocument$AttributeContext__
+#define __javax_swing_text_AbstractDocument$AttributeContext__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AbstractDocument$AttributeContext;
+          class AttributeSet;
+      }
+    }
+  }
+}
+
+class javax::swing::text::AbstractDocument$AttributeContext : public ::java::lang::Object
+{
+
+public:
+  virtual ::javax::swing::text::AttributeSet * addAttribute(::javax::swing::text::AttributeSet *, ::java::lang::Object *, ::java::lang::Object *) = 0;
+  virtual ::javax::swing::text::AttributeSet * addAttributes(::javax::swing::text::AttributeSet *, ::javax::swing::text::AttributeSet *) = 0;
+  virtual ::javax::swing::text::AttributeSet * getEmptySet() = 0;
+  virtual void reclaim(::javax::swing::text::AttributeSet *) = 0;
+  virtual ::javax::swing::text::AttributeSet * removeAttribute(::javax::swing::text::AttributeSet *, ::java::lang::Object *) = 0;
+  virtual ::javax::swing::text::AttributeSet * removeAttributes(::javax::swing::text::AttributeSet *, ::javax::swing::text::AttributeSet *) = 0;
+  virtual ::javax::swing::text::AttributeSet * removeAttributes(::javax::swing::text::AttributeSet *, ::java::util::Enumeration *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_text_AbstractDocument$AttributeContext__
diff --git a/libjava/javax/swing/text/AbstractDocument$BidiElement.h b/libjava/javax/swing/text/AbstractDocument$BidiElement.h
new file mode 100644
index 000000000..4d8a0c8df
--- /dev/null
+++ b/libjava/javax/swing/text/AbstractDocument$BidiElement.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_AbstractDocument$BidiElement__
+#define __javax_swing_text_AbstractDocument$BidiElement__
+
+#pragma interface
+
+#include <javax/swing/text/AbstractDocument$LeafElement.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AbstractDocument;
+          class AbstractDocument$BidiElement;
+          class Element;
+      }
+    }
+  }
+}
+
+class javax::swing::text::AbstractDocument$BidiElement : public ::javax::swing::text::AbstractDocument$LeafElement
+{
+
+public: // actually package-private
+  AbstractDocument$BidiElement(::javax::swing::text::AbstractDocument *, ::javax::swing::text::Element *, jint, jint, jint);
+public:
+  virtual ::java::lang::String * getName();
+public: // actually package-private
+  ::javax::swing::text::AbstractDocument * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractDocument$LeafElement)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_AbstractDocument$BidiElement__
diff --git a/libjava/javax/swing/text/AbstractDocument$BidiRootElement.h b/libjava/javax/swing/text/AbstractDocument$BidiRootElement.h
new file mode 100644
index 000000000..b9a908b7b
--- /dev/null
+++ b/libjava/javax/swing/text/AbstractDocument$BidiRootElement.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_AbstractDocument$BidiRootElement__
+#define __javax_swing_text_AbstractDocument$BidiRootElement__
+
+#pragma interface
+
+#include <javax/swing/text/AbstractDocument$BranchElement.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AbstractDocument;
+          class AbstractDocument$BidiRootElement;
+      }
+    }
+  }
+}
+
+class javax::swing::text::AbstractDocument$BidiRootElement : public ::javax::swing::text::AbstractDocument$BranchElement
+{
+
+public: // actually package-private
+  AbstractDocument$BidiRootElement(::javax::swing::text::AbstractDocument *);
+public:
+  virtual ::java::lang::String * getName();
+public: // actually package-private
+  ::javax::swing::text::AbstractDocument * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractDocument$BranchElement)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_AbstractDocument$BidiRootElement__
diff --git a/libjava/javax/swing/text/AbstractDocument$BranchElement.h b/libjava/javax/swing/text/AbstractDocument$BranchElement.h
new file mode 100644
index 000000000..1fb3a680a
--- /dev/null
+++ b/libjava/javax/swing/text/AbstractDocument$BranchElement.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_AbstractDocument$BranchElement__
+#define __javax_swing_text_AbstractDocument$BranchElement__
+
+#pragma interface
+
+#include <javax/swing/text/AbstractDocument$AbstractElement.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AbstractDocument;
+          class AbstractDocument$BranchElement;
+          class AttributeSet;
+          class Element;
+      }
+    }
+  }
+}
+
+class javax::swing::text::AbstractDocument$BranchElement : public ::javax::swing::text::AbstractDocument$AbstractElement
+{
+
+public:
+  AbstractDocument$BranchElement(::javax::swing::text::AbstractDocument *, ::javax::swing::text::Element *, ::javax::swing::text::AttributeSet *);
+  virtual ::java::util::Enumeration * children();
+  virtual jboolean getAllowsChildren();
+  virtual ::javax::swing::text::Element * getElement(jint);
+  virtual jint getElementCount();
+  virtual jint getElementIndex(jint);
+  virtual jint getEndOffset();
+  virtual ::java::lang::String * getName();
+  virtual jint getStartOffset();
+  virtual jboolean isLeaf();
+  virtual ::javax::swing::text::Element * positionToElement(jint);
+  virtual void replace(jint, jint, JArray< ::javax::swing::text::Element * > *);
+  virtual ::java::lang::String * toString();
+private:
+  static const jlong serialVersionUID = -6037216547466333183LL;
+  JArray< ::javax::swing::text::Element * > * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractDocument$AbstractElement)))) children__;
+  jint numChildren;
+  jint lastIndex;
+public: // actually package-private
+  ::javax::swing::text::AbstractDocument * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_AbstractDocument$BranchElement__
diff --git a/libjava/javax/swing/text/AbstractDocument$Bypass.h b/libjava/javax/swing/text/AbstractDocument$Bypass.h
new file mode 100644
index 000000000..bb850d91e
--- /dev/null
+++ b/libjava/javax/swing/text/AbstractDocument$Bypass.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_AbstractDocument$Bypass__
+#define __javax_swing_text_AbstractDocument$Bypass__
+
+#pragma interface
+
+#include <javax/swing/text/DocumentFilter$FilterBypass.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AbstractDocument;
+          class AbstractDocument$Bypass;
+          class AttributeSet;
+          class Document;
+      }
+    }
+  }
+}
+
+class javax::swing::text::AbstractDocument$Bypass : public ::javax::swing::text::DocumentFilter$FilterBypass
+{
+
+public: // actually package-private
+  AbstractDocument$Bypass(::javax::swing::text::AbstractDocument *);
+public:
+  virtual ::javax::swing::text::Document * getDocument();
+  virtual void insertString(jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *);
+  virtual void remove(jint, jint);
+  virtual void replace(jint, jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *);
+public: // actually package-private
+  ::javax::swing::text::AbstractDocument * __attribute__((aligned(__alignof__( ::javax::swing::text::DocumentFilter$FilterBypass)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_AbstractDocument$Bypass__
diff --git a/libjava/javax/swing/text/AbstractDocument$Content.h b/libjava/javax/swing/text/AbstractDocument$Content.h
new file mode 100644
index 000000000..be16e410b
--- /dev/null
+++ b/libjava/javax/swing/text/AbstractDocument$Content.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_AbstractDocument$Content__
+#define __javax_swing_text_AbstractDocument$Content__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AbstractDocument$Content;
+          class Position;
+          class Segment;
+      }
+      namespace undo
+      {
+          class UndoableEdit;
+      }
+    }
+  }
+}
+
+class javax::swing::text::AbstractDocument$Content : public ::java::lang::Object
+{
+
+public:
+  virtual ::javax::swing::text::Position * createPosition(jint) = 0;
+  virtual jint length() = 0;
+  virtual ::javax::swing::undo::UndoableEdit * insertString(jint, ::java::lang::String *) = 0;
+  virtual ::javax::swing::undo::UndoableEdit * remove(jint, jint) = 0;
+  virtual ::java::lang::String * getString(jint, jint) = 0;
+  virtual void getChars(jint, jint, ::javax::swing::text::Segment *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_text_AbstractDocument$Content__
diff --git a/libjava/javax/swing/text/AbstractDocument$DefaultDocumentEvent.h b/libjava/javax/swing/text/AbstractDocument$DefaultDocumentEvent.h
new file mode 100644
index 000000000..ab7c2a01c
--- /dev/null
+++ b/libjava/javax/swing/text/AbstractDocument$DefaultDocumentEvent.h
@@ -0,0 +1,62 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_AbstractDocument$DefaultDocumentEvent__
+#define __javax_swing_text_AbstractDocument$DefaultDocumentEvent__
+
+#pragma interface
+
+#include <javax/swing/undo/CompoundEdit.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class DocumentEvent$ElementChange;
+          class DocumentEvent$EventType;
+      }
+      namespace text
+      {
+          class AbstractDocument;
+          class AbstractDocument$DefaultDocumentEvent;
+          class Document;
+          class Element;
+      }
+      namespace undo
+      {
+          class UndoableEdit;
+      }
+    }
+  }
+}
+
+class javax::swing::text::AbstractDocument$DefaultDocumentEvent : public ::javax::swing::undo::CompoundEdit
+{
+
+public:
+  AbstractDocument$DefaultDocumentEvent(::javax::swing::text::AbstractDocument *, jint, jint, ::javax::swing::event::DocumentEvent$EventType *);
+  virtual jboolean addEdit(::javax::swing::undo::UndoableEdit *);
+  virtual ::javax::swing::text::Document * getDocument();
+  virtual jint getLength();
+  virtual jint getOffset();
+  virtual ::javax::swing::event::DocumentEvent$EventType * getType();
+  virtual ::javax::swing::event::DocumentEvent$ElementChange * getChange(::javax::swing::text::Element *);
+  virtual ::java::lang::String * toString();
+private:
+  static const jlong serialVersionUID = 5230037221564563284LL;
+  static const jint THRESHOLD = 10;
+  jint __attribute__((aligned(__alignof__( ::javax::swing::undo::CompoundEdit)))) offset;
+  jint length;
+  ::javax::swing::event::DocumentEvent$EventType * type;
+  ::java::util::HashMap * changes;
+  jboolean modified;
+public: // actually package-private
+  ::javax::swing::text::AbstractDocument * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_AbstractDocument$DefaultDocumentEvent__
diff --git a/libjava/javax/swing/text/AbstractDocument$ElementEdit.h b/libjava/javax/swing/text/AbstractDocument$ElementEdit.h
new file mode 100644
index 000000000..68eb020d1
--- /dev/null
+++ b/libjava/javax/swing/text/AbstractDocument$ElementEdit.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_AbstractDocument$ElementEdit__
+#define __javax_swing_text_AbstractDocument$ElementEdit__
+
+#pragma interface
+
+#include <javax/swing/undo/AbstractUndoableEdit.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AbstractDocument$ElementEdit;
+          class Element;
+      }
+    }
+  }
+}
+
+class javax::swing::text::AbstractDocument$ElementEdit : public ::javax::swing::undo::AbstractUndoableEdit
+{
+
+public:
+  AbstractDocument$ElementEdit(::javax::swing::text::Element *, jint, JArray< ::javax::swing::text::Element * > *, JArray< ::javax::swing::text::Element * > *);
+  virtual JArray< ::javax::swing::text::Element * > * getChildrenAdded();
+  virtual JArray< ::javax::swing::text::Element * > * getChildrenRemoved();
+  virtual ::javax::swing::text::Element * getElement();
+  virtual jint getIndex();
+private:
+  static const jlong serialVersionUID = -1216620962142928304LL;
+  ::javax::swing::text::Element * __attribute__((aligned(__alignof__( ::javax::swing::undo::AbstractUndoableEdit)))) elem;
+  jint index;
+  JArray< ::javax::swing::text::Element * > * removed;
+  JArray< ::javax::swing::text::Element * > * added;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_AbstractDocument$ElementEdit__
diff --git a/libjava/javax/swing/text/AbstractDocument$LeafElement.h b/libjava/javax/swing/text/AbstractDocument$LeafElement.h
new file mode 100644
index 000000000..0b8d671b6
--- /dev/null
+++ b/libjava/javax/swing/text/AbstractDocument$LeafElement.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_AbstractDocument$LeafElement__
+#define __javax_swing_text_AbstractDocument$LeafElement__
+
+#pragma interface
+
+#include <javax/swing/text/AbstractDocument$AbstractElement.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AbstractDocument;
+          class AbstractDocument$LeafElement;
+          class AttributeSet;
+          class Element;
+          class Position;
+      }
+    }
+  }
+}
+
+class javax::swing::text::AbstractDocument$LeafElement : public ::javax::swing::text::AbstractDocument$AbstractElement
+{
+
+public:
+  AbstractDocument$LeafElement(::javax::swing::text::AbstractDocument *, ::javax::swing::text::Element *, ::javax::swing::text::AttributeSet *, jint, jint);
+  virtual ::java::util::Enumeration * children();
+  virtual jboolean getAllowsChildren();
+  virtual ::javax::swing::text::Element * getElement(jint);
+  virtual jint getElementCount();
+  virtual jint getElementIndex(jint);
+  virtual jint getEndOffset();
+  virtual ::java::lang::String * getName();
+  virtual jint getStartOffset();
+  virtual jboolean isLeaf();
+  virtual ::java::lang::String * toString();
+private:
+  static const jlong serialVersionUID = -8906306331347768017LL;
+  ::javax::swing::text::Position * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractDocument$AbstractElement)))) startPos;
+  ::javax::swing::text::Position * endPos;
+public: // actually package-private
+  ::javax::swing::text::AbstractDocument * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_AbstractDocument$LeafElement__
diff --git a/libjava/javax/swing/text/AbstractDocument.h b/libjava/javax/swing/text/AbstractDocument.h
new file mode 100644
index 000000000..65110f0ce
--- /dev/null
+++ b/libjava/javax/swing/text/AbstractDocument.h
@@ -0,0 +1,166 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_AbstractDocument__
+#define __javax_swing_text_AbstractDocument__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class Bidi;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class DocumentEvent;
+          class DocumentListener;
+          class EventListenerList;
+          class UndoableEditEvent;
+          class UndoableEditListener;
+      }
+      namespace text
+      {
+          class AbstractDocument;
+          class AbstractDocument$AttributeContext;
+          class AbstractDocument$BidiRootElement;
+          class AbstractDocument$Content;
+          class AbstractDocument$DefaultDocumentEvent;
+          class AttributeSet;
+          class DocumentFilter;
+          class DocumentFilter$FilterBypass;
+          class Element;
+          class Position;
+          class Segment;
+      }
+    }
+  }
+}
+
+class javax::swing::text::AbstractDocument : public ::java::lang::Object
+{
+
+public: // actually protected
+  AbstractDocument(::javax::swing::text::AbstractDocument$Content *);
+  AbstractDocument(::javax::swing::text::AbstractDocument$Content *, ::javax::swing::text::AbstractDocument$AttributeContext *);
+private:
+  ::javax::swing::text::DocumentFilter$FilterBypass * getBypass();
+public:
+  virtual ::javax::swing::text::Element * getParagraphElement(jint) = 0;
+  virtual ::javax::swing::text::Element * getDefaultRootElement() = 0;
+public: // actually protected
+  virtual ::javax::swing::text::Element * createBranchElement(::javax::swing::text::Element *, ::javax::swing::text::AttributeSet *);
+  virtual ::javax::swing::text::Element * createLeafElement(::javax::swing::text::Element *, ::javax::swing::text::AttributeSet *, jint, jint);
+public:
+  virtual ::javax::swing::text::Position * createPosition(jint);
+public: // actually protected
+  virtual void fireChangedUpdate(::javax::swing::event::DocumentEvent *);
+  virtual void fireInsertUpdate(::javax::swing::event::DocumentEvent *);
+  virtual void fireRemoveUpdate(::javax::swing::event::DocumentEvent *);
+  virtual void fireUndoableEditUpdate(::javax::swing::event::UndoableEditEvent *);
+public:
+  virtual jint getAsynchronousLoadPriority();
+public: // actually protected
+  virtual ::javax::swing::text::AbstractDocument$AttributeContext * getAttributeContext();
+public:
+  virtual ::javax::swing::text::Element * getBidiRootElement();
+public: // actually protected
+  virtual ::javax::swing::text::AbstractDocument$Content * getContent();
+  virtual ::java::lang::Thread * getCurrentWriter();
+public:
+  virtual ::java::util::Dictionary * getDocumentProperties();
+  virtual ::javax::swing::text::Position * getEndPosition();
+  virtual jint getLength();
+  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
+  virtual ::java::lang::Object * getProperty(::java::lang::Object *);
+  virtual JArray< ::javax::swing::text::Element * > * getRootElements();
+  virtual ::javax::swing::text::Position * getStartPosition();
+  virtual ::java::lang::String * getText(jint, jint);
+  virtual void getText(jint, jint, ::javax::swing::text::Segment *);
+  virtual void insertString(jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *);
+public: // actually package-private
+  virtual void insertStringImpl(jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *);
+public: // actually protected
+  virtual void insertUpdate(::javax::swing::text::AbstractDocument$DefaultDocumentEvent *, ::javax::swing::text::AttributeSet *);
+  virtual void postRemoveUpdate(::javax::swing::text::AbstractDocument$DefaultDocumentEvent *);
+public:
+  virtual void putProperty(::java::lang::Object *, ::java::lang::Object *);
+private:
+  void updateBidi(::javax::swing::text::AbstractDocument$DefaultDocumentEvent *);
+  JArray< ::java::text::Bidi * > * getBidis(jint, jint);
+public:
+  virtual void readLock();
+  virtual void readUnlock();
+  virtual void remove(jint, jint);
+public: // actually package-private
+  virtual void removeImpl(jint, jint);
+public:
+  virtual void replace(jint, jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *);
+public: // actually package-private
+  virtual void replaceImpl(jint, jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *);
+public:
+  virtual void addDocumentListener(::javax::swing::event::DocumentListener *);
+  virtual void removeDocumentListener(::javax::swing::event::DocumentListener *);
+  virtual JArray< ::javax::swing::event::DocumentListener * > * getDocumentListeners();
+  virtual void addUndoableEditListener(::javax::swing::event::UndoableEditListener *);
+  virtual void removeUndoableEditListener(::javax::swing::event::UndoableEditListener *);
+  virtual JArray< ::javax::swing::event::UndoableEditListener * > * getUndoableEditListeners();
+public: // actually protected
+  virtual void removeUpdate(::javax::swing::text::AbstractDocument$DefaultDocumentEvent *);
+public:
+  virtual void render(::java::lang::Runnable *);
+  virtual void setAsynchronousLoadPriority(jint);
+  virtual void setDocumentProperties(::java::util::Dictionary *);
+public: // actually protected
+  virtual void writeLock();
+  virtual void writeUnlock();
+public:
+  virtual ::javax::swing::text::DocumentFilter * getDocumentFilter();
+  virtual void setDocumentFilter(::javax::swing::text::DocumentFilter *);
+  virtual void dump(::java::io::PrintStream *);
+private:
+  static const jlong serialVersionUID = 6842927725919637215LL;
+public: // actually protected
+  static ::java::lang::String * BAD_LOCATION;
+public:
+  static ::java::lang::String * BidiElementName;
+  static ::java::lang::String * ContentElementName;
+  static ::java::lang::String * ParagraphElementName;
+  static ::java::lang::String * SectionElementName;
+  static ::java::lang::String * ElementNameAttribute;
+private:
+  static ::java::lang::String * BidiRootName;
+  static ::java::lang::String * AsyncLoadPriority;
+  static ::java::lang::String * I18N;
+public: // actually package-private
+  ::javax::swing::text::AbstractDocument$Content * __attribute__((aligned(__alignof__( ::java::lang::Object)))) content;
+  ::javax::swing::text::AbstractDocument$AttributeContext * context;
+  ::javax::swing::text::DocumentFilter * documentFilter;
+  ::java::util::Dictionary * properties;
+public: // actually protected
+  ::javax::swing::event::EventListenerList * listenerList;
+private:
+  ::java::lang::Thread * currentWriter;
+  jint numReaders;
+  jint numWriters;
+  ::javax::swing::text::DocumentFilter$FilterBypass * bypass;
+  ::javax::swing::text::AbstractDocument$BidiRootElement * bidiRoot;
+  jboolean notifyListeners;
+public: // actually package-private
+  static jboolean $assertionsDisabled;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_AbstractDocument__
diff --git a/libjava/javax/swing/text/AbstractWriter.h b/libjava/javax/swing/text/AbstractWriter.h
new file mode 100644
index 000000000..b22be6e6f
--- /dev/null
+++ b/libjava/javax/swing/text/AbstractWriter.h
@@ -0,0 +1,91 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_AbstractWriter__
+#define __javax_swing_text_AbstractWriter__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AbstractWriter;
+          class AttributeSet;
+          class Document;
+          class Element;
+          class ElementIterator;
+      }
+    }
+  }
+}
+
+class javax::swing::text::AbstractWriter : public ::java::lang::Object
+{
+
+public: // actually protected
+  AbstractWriter(::java::io::Writer *, ::javax::swing::text::Document *);
+  AbstractWriter(::java::io::Writer *, ::javax::swing::text::Document *, jint, jint);
+  AbstractWriter(::java::io::Writer *, ::javax::swing::text::Element *);
+  AbstractWriter(::java::io::Writer *, ::javax::swing::text::Element *, jint, jint);
+  virtual ::javax::swing::text::ElementIterator * getElementIterator();
+  virtual ::java::io::Writer * getWriter();
+  virtual ::javax::swing::text::Document * getDocument();
+  virtual void write() = 0;
+  virtual ::java::lang::String * getText(::javax::swing::text::Element *);
+  virtual void output(JArray< jchar > *, jint, jint);
+  virtual void writeLineSeparator();
+  virtual void write(jchar);
+  virtual void write(::java::lang::String *);
+  virtual void write(JArray< jchar > *, jint, jint);
+  virtual void indent();
+public:
+  virtual jint getStartOffset();
+  virtual jint getEndOffset();
+public: // actually protected
+  virtual jboolean inRange(::javax::swing::text::Element *);
+  virtual void text(::javax::swing::text::Element *);
+  virtual void setLineLength(jint);
+  virtual jint getLineLength();
+  virtual void setCurrentLineLength(jint);
+  virtual jint getCurrentLineLength();
+  virtual jboolean isLineEmpty();
+  virtual void setCanWrapLines(jboolean);
+  virtual jboolean getCanWrapLines();
+  virtual void setIndentSpace(jint);
+  virtual jint getIndentSpace();
+public:
+  virtual void setLineSeparator(::java::lang::String *);
+  virtual ::java::lang::String * getLineSeparator();
+public: // actually protected
+  virtual void incrIndent();
+  virtual void decrIndent();
+  virtual jint getIndentLevel();
+  virtual void writeAttributes(::javax::swing::text::AttributeSet *);
+  static const jchar NEWLINE = 10;
+private:
+  ::java::io::Writer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) writer;
+  ::javax::swing::text::ElementIterator * iter;
+  ::javax::swing::text::Document * document;
+  jint maxLineLength;
+  jint lineLength;
+  jboolean canWrapLines;
+  jint indentSpace;
+  jint indentLevel;
+  jboolean indented;
+  jint startOffset;
+  jint endOffset;
+  ::java::lang::String * lineSeparator;
+  JArray< jchar > * lineSeparatorChars;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_AbstractWriter__
diff --git a/libjava/javax/swing/text/AsyncBoxView$ChildLocator.h b/libjava/javax/swing/text/AsyncBoxView$ChildLocator.h
new file mode 100644
index 000000000..72b0f9a6c
--- /dev/null
+++ b/libjava/javax/swing/text/AsyncBoxView$ChildLocator.h
@@ -0,0 +1,61 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_AsyncBoxView$ChildLocator__
+#define __javax_swing_text_AsyncBoxView$ChildLocator__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+        class Rectangle;
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AsyncBoxView;
+          class AsyncBoxView$ChildLocator;
+          class AsyncBoxView$ChildState;
+      }
+    }
+  }
+}
+
+class javax::swing::text::AsyncBoxView$ChildLocator : public ::java::lang::Object
+{
+
+public:
+  AsyncBoxView$ChildLocator(::javax::swing::text::AsyncBoxView *);
+  virtual void childChanged(::javax::swing::text::AsyncBoxView$ChildState *);
+  virtual jint getViewIndexAtPoint(jfloat, jfloat, ::java::awt::Shape *);
+  virtual ::java::awt::Shape * getChildAllocation(jint, ::java::awt::Shape *);
+  virtual void paintChildren(::java::awt::Graphics *);
+public: // actually protected
+  virtual ::java::awt::Shape * getChildAllocation(jint);
+  virtual void setAllocation(::java::awt::Shape *);
+  virtual jint getViewIndexAtVisualOffset(jfloat);
+private:
+  jint updateChildOffsets(jfloat);
+  void updateChildOffsetsToIndex(jint);
+public: // actually protected
+  ::javax::swing::text::AsyncBoxView$ChildState * __attribute__((aligned(__alignof__( ::java::lang::Object)))) lastValidOffset;
+  ::java::awt::Rectangle * lastAlloc;
+  ::java::awt::Rectangle * childAlloc;
+public: // actually package-private
+  ::javax::swing::text::AsyncBoxView * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_AsyncBoxView$ChildLocator__
diff --git a/libjava/javax/swing/text/AsyncBoxView$ChildState.h b/libjava/javax/swing/text/AsyncBoxView$ChildState.h
new file mode 100644
index 000000000..3bce589a2
--- /dev/null
+++ b/libjava/javax/swing/text/AsyncBoxView$ChildState.h
@@ -0,0 +1,63 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_AsyncBoxView$ChildState__
+#define __javax_swing_text_AsyncBoxView$ChildState__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AsyncBoxView;
+          class AsyncBoxView$ChildState;
+          class View;
+      }
+    }
+  }
+}
+
+class javax::swing::text::AsyncBoxView$ChildState : public ::java::lang::Object
+{
+
+public:
+  AsyncBoxView$ChildState(::javax::swing::text::AsyncBoxView *, ::javax::swing::text::View *);
+  virtual ::javax::swing::text::View * getChildView();
+  virtual jboolean isLayoutValid();
+  virtual void run();
+private:
+  void update();
+public:
+  virtual jfloat getMinorSpan();
+  virtual jfloat getMinorOffset();
+  virtual jfloat getMajorSpan();
+  virtual jfloat getMajorOffset();
+  virtual void setMajorOffset(jfloat);
+  virtual void preferenceChanged(jboolean, jboolean);
+private:
+  ::javax::swing::text::View * __attribute__((aligned(__alignof__( ::java::lang::Object)))) childView;
+  jboolean minorValid;
+  jboolean majorValid;
+public: // actually package-private
+  jboolean childSizeValid;
+  jfloat minimum;
+  jfloat preferred;
+private:
+  jfloat majorSpan;
+  jfloat majorOffset;
+  jfloat minorSpan;
+  jfloat minorOffset;
+  jfloat maximum;
+public: // actually package-private
+  ::javax::swing::text::AsyncBoxView * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_AsyncBoxView$ChildState__
diff --git a/libjava/javax/swing/text/AsyncBoxView$FlushTask.h b/libjava/javax/swing/text/AsyncBoxView$FlushTask.h
new file mode 100644
index 000000000..bd9378b4e
--- /dev/null
+++ b/libjava/javax/swing/text/AsyncBoxView$FlushTask.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_AsyncBoxView$FlushTask__
+#define __javax_swing_text_AsyncBoxView$FlushTask__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AsyncBoxView;
+          class AsyncBoxView$FlushTask;
+      }
+    }
+  }
+}
+
+class javax::swing::text::AsyncBoxView$FlushTask : public ::java::lang::Object
+{
+
+  AsyncBoxView$FlushTask(::javax::swing::text::AsyncBoxView *);
+public:
+  virtual void run();
+public: // actually package-private
+  AsyncBoxView$FlushTask(::javax::swing::text::AsyncBoxView *, ::javax::swing::text::AsyncBoxView$FlushTask *);
+  ::javax::swing::text::AsyncBoxView * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_AsyncBoxView$FlushTask__
diff --git a/libjava/javax/swing/text/AsyncBoxView.h b/libjava/javax/swing/text/AsyncBoxView.h
new file mode 100644
index 000000000..80a965f49
--- /dev/null
+++ b/libjava/javax/swing/text/AsyncBoxView.h
@@ -0,0 +1,116 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_AsyncBoxView__
+#define __javax_swing_text_AsyncBoxView__
+
+#pragma interface
+
+#include <javax/swing/text/View.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class DocumentEvent;
+          class DocumentEvent$ElementChange;
+      }
+      namespace text
+      {
+          class AsyncBoxView;
+          class AsyncBoxView$ChildLocator;
+          class AsyncBoxView$ChildState;
+          class Element;
+          class LayoutQueue;
+          class Position$Bias;
+          class View;
+          class ViewFactory;
+      }
+    }
+  }
+}
+
+class javax::swing::text::AsyncBoxView : public ::javax::swing::text::View
+{
+
+public:
+  AsyncBoxView(::javax::swing::text::Element *, jint);
+  virtual jint getMajorAxis();
+  virtual jint getMinorAxis();
+  virtual ::javax::swing::text::View * getView(jint);
+  virtual jint getViewCount();
+  virtual jint getViewIndex(jint, ::javax::swing::text::Position$Bias *);
+  virtual jfloat getTopInset();
+  virtual void setTopInset(jfloat);
+  virtual jfloat getBottomInset();
+  virtual void setBottomInset(jfloat);
+  virtual jfloat getLeftInset();
+  virtual void setLeftInset(jfloat);
+  virtual jfloat getRightInset();
+  virtual void setRightInset(jfloat);
+public: // actually protected
+  virtual void loadChildren(::javax::swing::text::ViewFactory *);
+  virtual jfloat getInsetSpan(jint);
+  virtual void setEstimatedMajorSpan(jboolean);
+  virtual jboolean getEstimatedMajorSpan();
+  virtual void minorRequirementChange(::javax::swing::text::AsyncBoxView$ChildState *);
+  virtual void majorRequirementChange(::javax::swing::text::AsyncBoxView$ChildState *, jfloat);
+public:
+  virtual void setParent(::javax::swing::text::View *);
+  virtual void setSize(jfloat, jfloat);
+  virtual void replace(jint, jint, JArray< ::javax::swing::text::View * > *);
+  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
+  virtual jfloat getPreferredSpan(jint);
+  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
+  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
+  virtual ::java::awt::Shape * getChildAllocation(jint, ::java::awt::Shape *);
+  virtual jfloat getMaximumSpan(jint);
+  virtual jfloat getMinimumSpan(jint);
+  virtual void preferenceChanged(::javax::swing::text::View *, jboolean, jboolean);
+public: // actually protected
+  virtual void updateLayout(::javax::swing::event::DocumentEvent$ElementChange *, ::javax::swing::event::DocumentEvent *, ::java::awt::Shape *);
+  virtual ::javax::swing::text::AsyncBoxView$ChildState * getChildState(jint);
+  virtual ::javax::swing::text::LayoutQueue * getLayoutQueue();
+  virtual jint getViewIndexAtPosition(jint, ::javax::swing::text::Position$Bias *);
+  virtual ::javax::swing::text::AsyncBoxView$ChildState * createChildState(::javax::swing::text::View *);
+  virtual void flushRequirementChanges();
+private:
+  jint __attribute__((aligned(__alignof__( ::javax::swing::text::View)))) majorAxis;
+  jfloat topInset;
+  jfloat bottomInset;
+  jfloat leftInset;
+  jboolean estimatedMajorSpan;
+  jfloat rightInset;
+  ::java::util::ArrayList * childStates;
+public: // actually package-private
+  ::javax::swing::text::AsyncBoxView$ChildState * changing;
+  ::javax::swing::text::AsyncBoxView$ChildState * minReq;
+  ::javax::swing::text::AsyncBoxView$ChildState * prefReq;
+private:
+  jboolean majorChanged;
+public: // actually package-private
+  jboolean minorChanged;
+  jfloat majorSpan;
+  jfloat minorSpan;
+private:
+  ::java::lang::Runnable * flushTask;
+public: // actually protected
+  ::javax::swing::text::AsyncBoxView$ChildLocator * locator;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_AsyncBoxView__
diff --git a/libjava/javax/swing/text/AttributeSet$CharacterAttribute.h b/libjava/javax/swing/text/AttributeSet$CharacterAttribute.h
new file mode 100644
index 000000000..ddc9c19f4
--- /dev/null
+++ b/libjava/javax/swing/text/AttributeSet$CharacterAttribute.h
@@ -0,0 +1,31 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_AttributeSet$CharacterAttribute__
+#define __javax_swing_text_AttributeSet$CharacterAttribute__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AttributeSet$CharacterAttribute;
+      }
+    }
+  }
+}
+
+class javax::swing::text::AttributeSet$CharacterAttribute : public ::java::lang::Object
+{
+
+public:
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_text_AttributeSet$CharacterAttribute__
diff --git a/libjava/javax/swing/text/AttributeSet$ColorAttribute.h b/libjava/javax/swing/text/AttributeSet$ColorAttribute.h
new file mode 100644
index 000000000..c04b096d0
--- /dev/null
+++ b/libjava/javax/swing/text/AttributeSet$ColorAttribute.h
@@ -0,0 +1,31 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_AttributeSet$ColorAttribute__
+#define __javax_swing_text_AttributeSet$ColorAttribute__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AttributeSet$ColorAttribute;
+      }
+    }
+  }
+}
+
+class javax::swing::text::AttributeSet$ColorAttribute : public ::java::lang::Object
+{
+
+public:
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_text_AttributeSet$ColorAttribute__
diff --git a/libjava/javax/swing/text/AttributeSet$FontAttribute.h b/libjava/javax/swing/text/AttributeSet$FontAttribute.h
new file mode 100644
index 000000000..eff25222a
--- /dev/null
+++ b/libjava/javax/swing/text/AttributeSet$FontAttribute.h
@@ -0,0 +1,31 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_AttributeSet$FontAttribute__
+#define __javax_swing_text_AttributeSet$FontAttribute__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AttributeSet$FontAttribute;
+      }
+    }
+  }
+}
+
+class javax::swing::text::AttributeSet$FontAttribute : public ::java::lang::Object
+{
+
+public:
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_text_AttributeSet$FontAttribute__
diff --git a/libjava/javax/swing/text/AttributeSet$ParagraphAttribute.h b/libjava/javax/swing/text/AttributeSet$ParagraphAttribute.h
new file mode 100644
index 000000000..05f67c16b
--- /dev/null
+++ b/libjava/javax/swing/text/AttributeSet$ParagraphAttribute.h
@@ -0,0 +1,31 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_AttributeSet$ParagraphAttribute__
+#define __javax_swing_text_AttributeSet$ParagraphAttribute__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AttributeSet$ParagraphAttribute;
+      }
+    }
+  }
+}
+
+class javax::swing::text::AttributeSet$ParagraphAttribute : public ::java::lang::Object
+{
+
+public:
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_text_AttributeSet$ParagraphAttribute__
diff --git a/libjava/javax/swing/text/AttributeSet.h b/libjava/javax/swing/text/AttributeSet.h
new file mode 100644
index 000000000..ba1f4d100
--- /dev/null
+++ b/libjava/javax/swing/text/AttributeSet.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_AttributeSet__
+#define __javax_swing_text_AttributeSet__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AttributeSet;
+      }
+    }
+  }
+}
+
+class javax::swing::text::AttributeSet : public ::java::lang::Object
+{
+
+public:
+  virtual jboolean containsAttribute(::java::lang::Object *, ::java::lang::Object *) = 0;
+  virtual jboolean containsAttributes(::javax::swing::text::AttributeSet *) = 0;
+  virtual ::javax::swing::text::AttributeSet * copyAttributes() = 0;
+  virtual ::java::lang::Object * getAttribute(::java::lang::Object *) = 0;
+  virtual jint getAttributeCount() = 0;
+  virtual ::java::util::Enumeration * getAttributeNames() = 0;
+  virtual ::javax::swing::text::AttributeSet * getResolveParent() = 0;
+  virtual jboolean isDefined(::java::lang::Object *) = 0;
+  virtual jboolean isEqual(::javax::swing::text::AttributeSet *) = 0;
+  static ::java::lang::Object * NameAttribute;
+  static ::java::lang::Object * ResolveAttribute;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_text_AttributeSet__
diff --git a/libjava/javax/swing/text/BadLocationException.h b/libjava/javax/swing/text/BadLocationException.h
new file mode 100644
index 000000000..3102b7a37
--- /dev/null
+++ b/libjava/javax/swing/text/BadLocationException.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_BadLocationException__
+#define __javax_swing_text_BadLocationException__
+
+#pragma interface
+
+#include <java/lang/Exception.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class BadLocationException;
+      }
+    }
+  }
+}
+
+class javax::swing::text::BadLocationException : public ::java::lang::Exception
+{
+
+public:
+  BadLocationException(::java::lang::String *, jint);
+  virtual jint offsetRequested();
+private:
+  static const jlong serialVersionUID = -7712259886815656766LL;
+public: // actually package-private
+  jint __attribute__((aligned(__alignof__( ::java::lang::Exception)))) offset;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_BadLocationException__
diff --git a/libjava/javax/swing/text/BoxView.h b/libjava/javax/swing/text/BoxView.h
new file mode 100644
index 000000000..c00436887
--- /dev/null
+++ b/libjava/javax/swing/text/BoxView.h
@@ -0,0 +1,115 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_BoxView__
+#define __javax_swing_text_BoxView__
+
+#pragma interface
+
+#include <javax/swing/text/CompositeView.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+        class Rectangle;
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class SizeRequirements;
+      namespace event
+      {
+          class DocumentEvent;
+          class DocumentEvent$ElementChange;
+      }
+      namespace text
+      {
+          class BoxView;
+          class Element;
+          class Position$Bias;
+          class View;
+          class ViewFactory;
+      }
+    }
+  }
+}
+
+class javax::swing::text::BoxView : public ::javax::swing::text::CompositeView
+{
+
+public:
+  BoxView(::javax::swing::text::Element *, jint);
+  virtual jint getAxis();
+  virtual void setAxis(jint);
+  virtual void layoutChanged(jint);
+public: // actually protected
+  virtual jboolean isLayoutValid(jint);
+  virtual void paintChild(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
+public:
+  virtual void replace(jint, jint, JArray< ::javax::swing::text::View * > *);
+private:
+  JArray< jint > * replaceLayoutArray(JArray< jint > *, jint, jint);
+public:
+  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
+  virtual jfloat getPreferredSpan(jint);
+  virtual jfloat getMaximumSpan(jint);
+  virtual jfloat getMinimumSpan(jint);
+public: // actually protected
+  virtual ::javax::swing::SizeRequirements * baselineRequirements(jint, ::javax::swing::SizeRequirements *);
+  virtual void baselineLayout(jint, jint, JArray< jint > *, JArray< jint > *);
+  virtual ::javax::swing::SizeRequirements * calculateMajorAxisRequirements(jint, ::javax::swing::SizeRequirements *);
+  virtual ::javax::swing::SizeRequirements * calculateMinorAxisRequirements(jint, ::javax::swing::SizeRequirements *);
+  virtual jboolean isBefore(jint, jint, ::java::awt::Rectangle *);
+  virtual jboolean isAfter(jint, jint, ::java::awt::Rectangle *);
+  virtual ::javax::swing::text::View * getViewAtPoint(jint, jint, ::java::awt::Rectangle *);
+  virtual void childAllocation(jint, ::java::awt::Rectangle *);
+  virtual void layout(jint, jint);
+private:
+  void layoutAxis(jint, jint);
+public: // actually protected
+  virtual void layoutMajorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
+  virtual void layoutMinorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
+  virtual jboolean isAllocationValid();
+public:
+  virtual jint getWidth();
+  virtual jint getHeight();
+  virtual void setSize(jfloat, jfloat);
+public: // actually protected
+  virtual jint getSpan(jint, jint);
+  virtual jint getOffset(jint, jint);
+public:
+  virtual jfloat getAlignment(jint);
+  virtual void preferenceChanged(::javax::swing::text::View *, jboolean, jboolean);
+  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
+  virtual jint getResizeWeight(jint);
+  virtual ::java::awt::Shape * getChildAllocation(jint, ::java::awt::Shape *);
+public: // actually protected
+  virtual void forwardUpdate(::javax::swing::event::DocumentEvent$ElementChange *, ::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+public:
+  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
+public: // actually protected
+  virtual jboolean flipEastAndWestAtEnds(jint, ::javax::swing::text::Position$Bias *);
+private:
+  void updateRequirements(jint);
+  jint __attribute__((aligned(__alignof__( ::javax::swing::text::CompositeView)))) myAxis;
+  JArray< jboolean > * layoutValid;
+  JArray< jboolean > * requirementsValid;
+  JArray< JArray< jint > * > * spans;
+  JArray< JArray< jint > * > * offsets;
+  JArray< ::javax::swing::SizeRequirements * > * requirements;
+  JArray< jint > * span;
+  ::java::awt::Rectangle * tmpRect;
+  ::java::awt::Rectangle * clipRect;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_BoxView__
diff --git a/libjava/javax/swing/text/Caret.h b/libjava/javax/swing/text/Caret.h
new file mode 100644
index 000000000..024933a04
--- /dev/null
+++ b/libjava/javax/swing/text/Caret.h
@@ -0,0 +1,61 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_Caret__
+#define __javax_swing_text_Caret__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+        class Point;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ChangeListener;
+      }
+      namespace text
+      {
+          class Caret;
+          class JTextComponent;
+      }
+    }
+  }
+}
+
+class javax::swing::text::Caret : public ::java::lang::Object
+{
+
+public:
+  virtual void addChangeListener(::javax::swing::event::ChangeListener *) = 0;
+  virtual void removeChangeListener(::javax::swing::event::ChangeListener *) = 0;
+  virtual void install(::javax::swing::text::JTextComponent *) = 0;
+  virtual void deinstall(::javax::swing::text::JTextComponent *) = 0;
+  virtual jint getBlinkRate() = 0;
+  virtual void setBlinkRate(jint) = 0;
+  virtual jint getDot() = 0;
+  virtual void setDot(jint) = 0;
+  virtual void moveDot(jint) = 0;
+  virtual jint getMark() = 0;
+  virtual ::java::awt::Point * getMagicCaretPosition() = 0;
+  virtual void setMagicCaretPosition(::java::awt::Point *) = 0;
+  virtual jboolean isSelectionVisible() = 0;
+  virtual void setSelectionVisible(jboolean) = 0;
+  virtual jboolean isVisible() = 0;
+  virtual void setVisible(jboolean) = 0;
+  virtual void paint(::java::awt::Graphics *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_text_Caret__
diff --git a/libjava/javax/swing/text/ChangedCharSetException.h b/libjava/javax/swing/text/ChangedCharSetException.h
new file mode 100644
index 000000000..d25d88cd9
--- /dev/null
+++ b/libjava/javax/swing/text/ChangedCharSetException.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_ChangedCharSetException__
+#define __javax_swing_text_ChangedCharSetException__
+
+#pragma interface
+
+#include <java/io/IOException.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class ChangedCharSetException;
+      }
+    }
+  }
+}
+
+class javax::swing::text::ChangedCharSetException : public ::java::io::IOException
+{
+
+public:
+  ChangedCharSetException(::java::lang::String *, jboolean);
+  virtual ::java::lang::String * getCharSetSpec();
+  virtual jboolean keyEqualsCharSet();
+private:
+  static const jlong serialVersionUID = 9119851554465432389LL;
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::io::IOException)))) m_charSetSpec;
+  jboolean m_charSetKey;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_ChangedCharSetException__
diff --git a/libjava/javax/swing/text/ComponentView$1.h b/libjava/javax/swing/text/ComponentView$1.h
new file mode 100644
index 000000000..5cdff36c8
--- /dev/null
+++ b/libjava/javax/swing/text/ComponentView$1.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_ComponentView$1__
+#define __javax_swing_text_ComponentView$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class ComponentView;
+          class ComponentView$1;
+      }
+    }
+  }
+}
+
+class javax::swing::text::ComponentView$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  ComponentView$1(::javax::swing::text::ComponentView *);
+public:
+  virtual void run();
+public: // actually package-private
+  ::javax::swing::text::ComponentView * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_ComponentView$1__
diff --git a/libjava/javax/swing/text/ComponentView$Interceptor.h b/libjava/javax/swing/text/ComponentView$Interceptor.h
new file mode 100644
index 000000000..57a14a5ab
--- /dev/null
+++ b/libjava/javax/swing/text/ComponentView$Interceptor.h
@@ -0,0 +1,63 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_ComponentView$Interceptor__
+#define __javax_swing_text_ComponentView$Interceptor__
+
+#pragma interface
+
+#include <java/awt/Container.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Dimension;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class ComponentView;
+          class ComponentView$Interceptor;
+      }
+    }
+  }
+}
+
+class javax::swing::text::ComponentView$Interceptor : public ::java::awt::Container
+{
+
+public: // actually package-private
+  ComponentView$Interceptor(::javax::swing::text::ComponentView *, ::java::awt::Component *);
+public:
+  virtual void invalidate();
+  virtual void doLayout();
+  virtual void reshape(jint, jint, jint, jint);
+  virtual void show();
+  virtual void hide();
+  virtual ::java::awt::Dimension * getMinimumSize();
+  virtual ::java::awt::Dimension * getPreferredSize();
+  virtual ::java::awt::Dimension * getMaximumSize();
+  virtual jfloat getAlignmentX();
+  virtual jfloat getAlignmentY();
+private:
+  void maybeValidate();
+  void cacheComponentSizes();
+public: // actually package-private
+  ::java::awt::Dimension * __attribute__((aligned(__alignof__( ::java::awt::Container)))) min;
+  ::java::awt::Dimension * pref;
+  ::java::awt::Dimension * max;
+  jfloat alignX;
+  jfloat alignY;
+  ::javax::swing::text::ComponentView * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_ComponentView$Interceptor__
diff --git a/libjava/javax/swing/text/ComponentView.h b/libjava/javax/swing/text/ComponentView.h
new file mode 100644
index 000000000..0a333cf86
--- /dev/null
+++ b/libjava/javax/swing/text/ComponentView.h
@@ -0,0 +1,68 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_ComponentView__
+#define __javax_swing_text_ComponentView__
+
+#pragma interface
+
+#include <javax/swing/text/View.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Graphics;
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class ComponentView;
+          class ComponentView$Interceptor;
+          class Element;
+          class Position$Bias;
+          class View;
+      }
+    }
+  }
+}
+
+class javax::swing::text::ComponentView : public ::javax::swing::text::View
+{
+
+public:
+  ComponentView(::javax::swing::text::Element *);
+public: // actually protected
+  virtual ::java::awt::Component * createComponent();
+public:
+  virtual jfloat getAlignment(jint);
+  virtual ::java::awt::Component * getComponent();
+  virtual jfloat getMaximumSpan(jint);
+  virtual jfloat getMinimumSpan(jint);
+  virtual jfloat getPreferredSpan(jint);
+  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
+  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
+  virtual void setParent(::javax::swing::text::View *);
+public: // actually package-private
+  virtual void setParentImpl();
+public:
+  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
+private:
+  ::java::awt::Component * __attribute__((aligned(__alignof__( ::javax::swing::text::View)))) comp;
+  ::javax::swing::text::ComponentView$Interceptor * interceptor;
+public: // actually package-private
+  static jboolean $assertionsDisabled;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_ComponentView__
diff --git a/libjava/javax/swing/text/CompositeView.h b/libjava/javax/swing/text/CompositeView.h
new file mode 100644
index 000000000..2e708ffa1
--- /dev/null
+++ b/libjava/javax/swing/text/CompositeView.h
@@ -0,0 +1,86 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_CompositeView__
+#define __javax_swing_text_CompositeView__
+
+#pragma interface
+
+#include <javax/swing/text/View.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Rectangle;
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AttributeSet;
+          class CompositeView;
+          class Element;
+          class Position$Bias;
+          class View;
+          class ViewFactory;
+      }
+    }
+  }
+}
+
+class javax::swing::text::CompositeView : public ::javax::swing::text::View
+{
+
+public:
+  CompositeView(::javax::swing::text::Element *);
+public: // actually protected
+  virtual void loadChildren(::javax::swing::text::ViewFactory *);
+public:
+  virtual void setParent(::javax::swing::text::View *);
+  virtual jint getViewCount();
+  virtual ::javax::swing::text::View * getView(jint);
+  virtual void replace(jint, jint, JArray< ::javax::swing::text::View * > *);
+  virtual ::java::awt::Shape * getChildAllocation(jint, ::java::awt::Shape *);
+  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
+  virtual ::java::awt::Shape * modelToView(jint, ::javax::swing::text::Position$Bias *, jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *);
+  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
+  virtual jint getNextVisualPositionFrom(jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
+  virtual jint getViewIndex(jint, ::javax::swing::text::Position$Bias *);
+public: // actually protected
+  virtual jboolean isBefore(jint, jint, ::java::awt::Rectangle *) = 0;
+  virtual jboolean isAfter(jint, jint, ::java::awt::Rectangle *) = 0;
+  virtual ::javax::swing::text::View * getViewAtPoint(jint, jint, ::java::awt::Rectangle *) = 0;
+  virtual void childAllocation(jint, ::java::awt::Rectangle *) = 0;
+  virtual ::javax::swing::text::View * getViewAtPosition(jint, ::java::awt::Rectangle *);
+  virtual jint getViewIndexAtPosition(jint);
+  virtual ::java::awt::Rectangle * getInsideAllocation(::java::awt::Shape *);
+  virtual void setParagraphInsets(::javax::swing::text::AttributeSet *);
+  virtual void setInsets(jshort, jshort, jshort, jshort);
+  virtual jshort getLeftInset();
+  virtual jshort getRightInset();
+  virtual jshort getTopInset();
+  virtual jshort getBottomInset();
+  virtual jint getNextNorthSouthVisualPositionFrom(jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
+  virtual jint getNextEastWestVisualPositionFrom(jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
+  virtual jboolean flipEastAndWestAtEnds(jint, ::javax::swing::text::Position$Bias *);
+private:
+  JArray< ::javax::swing::text::View * > * __attribute__((aligned(__alignof__( ::javax::swing::text::View)))) children;
+  jint numChildren;
+  ::java::awt::Rectangle * insideAllocation;
+  jshort top;
+  jshort bottom;
+  jshort left;
+  jshort right;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_CompositeView__
diff --git a/libjava/javax/swing/text/DateFormatter.h b/libjava/javax/swing/text/DateFormatter.h
new file mode 100644
index 000000000..47da776da
--- /dev/null
+++ b/libjava/javax/swing/text/DateFormatter.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DateFormatter__
+#define __javax_swing_text_DateFormatter__
+
+#pragma interface
+
+#include <javax/swing/text/InternationalFormatter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class DateFormat;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DateFormatter;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DateFormatter : public ::javax::swing::text::InternationalFormatter
+{
+
+public:
+  DateFormatter();
+  DateFormatter(::java::text::DateFormat *);
+  virtual void setFormat(::java::text::DateFormat *);
+private:
+  static const jlong serialVersionUID = 5423279572591848797LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DateFormatter__
diff --git a/libjava/javax/swing/text/DefaultCaret$BlinkTimerListener.h b/libjava/javax/swing/text/DefaultCaret$BlinkTimerListener.h
new file mode 100644
index 000000000..a29c4aaa2
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultCaret$BlinkTimerListener.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultCaret$BlinkTimerListener__
+#define __javax_swing_text_DefaultCaret$BlinkTimerListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultCaret;
+          class DefaultCaret$BlinkTimerListener;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultCaret$BlinkTimerListener : public ::java::lang::Object
+{
+
+  DefaultCaret$BlinkTimerListener(::javax::swing::text::DefaultCaret *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually package-private
+  DefaultCaret$BlinkTimerListener(::javax::swing::text::DefaultCaret *, ::javax::swing::text::DefaultCaret$BlinkTimerListener *);
+  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) ignoreNextEvent;
+  ::javax::swing::text::DefaultCaret * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultCaret$BlinkTimerListener__
diff --git a/libjava/javax/swing/text/DefaultCaret$Bypass.h b/libjava/javax/swing/text/DefaultCaret$Bypass.h
new file mode 100644
index 000000000..045d191f1
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultCaret$Bypass.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultCaret$Bypass__
+#define __javax_swing_text_DefaultCaret$Bypass__
+
+#pragma interface
+
+#include <javax/swing/text/NavigationFilter$FilterBypass.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Caret;
+          class DefaultCaret;
+          class DefaultCaret$Bypass;
+          class Position$Bias;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultCaret$Bypass : public ::javax::swing::text::NavigationFilter$FilterBypass
+{
+
+public: // actually package-private
+  DefaultCaret$Bypass(::javax::swing::text::DefaultCaret *);
+public:
+  virtual ::javax::swing::text::Caret * getCaret();
+  virtual void moveDot(jint, ::javax::swing::text::Position$Bias *);
+  virtual void setDot(jint, ::javax::swing::text::Position$Bias *);
+public: // actually package-private
+  ::javax::swing::text::DefaultCaret * __attribute__((aligned(__alignof__( ::javax::swing::text::NavigationFilter$FilterBypass)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultCaret$Bypass__
diff --git a/libjava/javax/swing/text/DefaultCaret$DocumentHandler.h b/libjava/javax/swing/text/DefaultCaret$DocumentHandler.h
new file mode 100644
index 000000000..64b15b178
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultCaret$DocumentHandler.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultCaret$DocumentHandler__
+#define __javax_swing_text_DefaultCaret$DocumentHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class DocumentEvent;
+      }
+      namespace text
+      {
+          class DefaultCaret;
+          class DefaultCaret$DocumentHandler;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultCaret$DocumentHandler : public ::java::lang::Object
+{
+
+  DefaultCaret$DocumentHandler(::javax::swing::text::DefaultCaret *);
+public:
+  virtual void changedUpdate(::javax::swing::event::DocumentEvent *);
+  virtual void insertUpdate(::javax::swing::event::DocumentEvent *);
+  virtual void removeUpdate(::javax::swing::event::DocumentEvent *);
+public: // actually package-private
+  DefaultCaret$DocumentHandler(::javax::swing::text::DefaultCaret *, ::javax::swing::text::DefaultCaret$DocumentHandler *);
+  ::javax::swing::text::DefaultCaret * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultCaret$DocumentHandler__
diff --git a/libjava/javax/swing/text/DefaultCaret$PropertyChangeHandler.h b/libjava/javax/swing/text/DefaultCaret$PropertyChangeHandler.h
new file mode 100644
index 000000000..469a8858e
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultCaret$PropertyChangeHandler.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultCaret$PropertyChangeHandler__
+#define __javax_swing_text_DefaultCaret$PropertyChangeHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeEvent;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultCaret;
+          class DefaultCaret$PropertyChangeHandler;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultCaret$PropertyChangeHandler : public ::java::lang::Object
+{
+
+  DefaultCaret$PropertyChangeHandler(::javax::swing::text::DefaultCaret *);
+public:
+  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+public: // actually package-private
+  DefaultCaret$PropertyChangeHandler(::javax::swing::text::DefaultCaret *, ::javax::swing::text::DefaultCaret$PropertyChangeHandler *);
+  ::javax::swing::text::DefaultCaret * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultCaret$PropertyChangeHandler__
diff --git a/libjava/javax/swing/text/DefaultCaret.h b/libjava/javax/swing/text/DefaultCaret.h
new file mode 100644
index 000000000..882bda70c
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultCaret.h
@@ -0,0 +1,161 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultCaret__
+#define __javax_swing_text_DefaultCaret__
+
+#pragma interface
+
+#include <java/awt/Rectangle.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+        class Point;
+        class Rectangle;
+      namespace event
+      {
+          class FocusEvent;
+          class MouseEvent;
+      }
+    }
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Timer;
+      namespace event
+      {
+          class ChangeEvent;
+          class ChangeListener;
+          class DocumentListener;
+          class EventListenerList;
+      }
+      namespace text
+      {
+          class DefaultCaret;
+          class DefaultCaret$BlinkTimerListener;
+          class Highlighter$HighlightPainter;
+          class JTextComponent;
+          class NavigationFilter$FilterBypass;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultCaret : public ::java::awt::Rectangle
+{
+
+public:
+  DefaultCaret();
+private:
+  ::javax::swing::text::NavigationFilter$FilterBypass * getBypass();
+public:
+  virtual void setUpdatePolicy(jint);
+  virtual jint getUpdatePolicy();
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+  virtual void mouseClicked(::java::awt::event::MouseEvent *);
+  virtual void mouseEntered(::java::awt::event::MouseEvent *);
+  virtual void mouseExited(::java::awt::event::MouseEvent *);
+  virtual void mousePressed(::java::awt::event::MouseEvent *);
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+  virtual void focusGained(::java::awt::event::FocusEvent *);
+  virtual void focusLost(::java::awt::event::FocusEvent *);
+private:
+  void updateTimerStatus();
+public: // actually protected
+  virtual void moveCaret(::java::awt::event::MouseEvent *);
+  virtual void positionCaret(::java::awt::event::MouseEvent *);
+public:
+  virtual void deinstall(::javax::swing::text::JTextComponent *);
+  virtual void install(::javax::swing::text::JTextComponent *);
+  virtual void setMagicCaretPosition(::java::awt::Point *);
+  virtual ::java::awt::Point * getMagicCaretPosition();
+  virtual jint getMark();
+private:
+  void clearHighlight();
+  void handleHighlight();
+public:
+  virtual void setSelectionVisible(jboolean);
+  virtual jboolean isSelectionVisible();
+public: // actually protected
+  virtual void repaint();
+public:
+  virtual void paint(::java::awt::Graphics *);
+  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
+  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
+  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
+  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
+public: // actually protected
+  virtual void fireStateChanged();
+  virtual ::javax::swing::text::JTextComponent * getComponent();
+public:
+  virtual jint getBlinkRate();
+  virtual void setBlinkRate(jint);
+  virtual jint getDot();
+  virtual void moveDot(jint);
+public: // actually package-private
+  virtual void moveDotImpl(jint);
+public:
+  virtual void setDot(jint);
+public: // actually package-private
+  virtual void setDotImpl(jint);
+  virtual void appear();
+public:
+  virtual jboolean isActive();
+  virtual jboolean isVisible();
+  virtual void setVisible(jboolean);
+public: // actually protected
+  virtual ::javax::swing::text::Highlighter$HighlightPainter * getSelectionPainter();
+  virtual void damage(::java::awt::Rectangle *);
+  virtual void adjustVisibility(::java::awt::Rectangle *);
+private:
+  void initBlinkTimer();
+public: // actually package-private
+  static ::javax::swing::text::JTextComponent * componentWithSelection;
+private:
+  static const jlong serialVersionUID = 4325555698756477346LL;
+public:
+  static const jint ALWAYS_UPDATE = 2;
+  static const jint NEVER_UPDATE = 1;
+  static const jint UPDATE_WHEN_ON_EDT = 0;
+public: // actually package-private
+  jint __attribute__((aligned(__alignof__( ::java::awt::Rectangle)))) policy;
+public: // actually protected
+  ::javax::swing::event::ChangeEvent * changeEvent;
+  ::javax::swing::event::EventListenerList * listenerList;
+public: // actually package-private
+  ::javax::swing::event::DocumentListener * documentListener;
+  ::java::beans::PropertyChangeListener * propertyChangeListener;
+  ::javax::swing::text::JTextComponent * textComponent;
+private:
+  jboolean selectionVisible;
+  jint blinkRate;
+  jint dot;
+  jint mark;
+  ::java::awt::Point * magicCaretPosition;
+public: // actually package-private
+  jboolean visible;
+  jboolean active;
+private:
+  ::java::lang::Object * highlightEntry;
+  ::javax::swing::Timer * blinkTimer;
+  ::javax::swing::text::DefaultCaret$BlinkTimerListener * blinkListener;
+public: // actually package-private
+  ::javax::swing::text::NavigationFilter$FilterBypass * bypass;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultCaret__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$BackwardAction.h b/libjava/javax/swing/text/DefaultEditorKit$BackwardAction.h
new file mode 100644
index 000000000..7161c7a53
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$BackwardAction.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$BackwardAction__
+#define __javax_swing_text_DefaultEditorKit$BackwardAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction$HorizontalMovementAction.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Caret;
+          class DefaultEditorKit$BackwardAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$BackwardAction : public ::javax::swing::text::TextAction$HorizontalMovementAction
+{
+
+public: // actually package-private
+  DefaultEditorKit$BackwardAction();
+public: // actually protected
+  virtual void actionPerformedImpl(::javax::swing::text::Caret *, jint);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$BackwardAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$BeepAction.h b/libjava/javax/swing/text/DefaultEditorKit$BeepAction.h
new file mode 100644
index 000000000..dfeb6a870
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$BeepAction.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$BeepAction__
+#define __javax_swing_text_DefaultEditorKit$BeepAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultEditorKit$BeepAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$BeepAction : public ::javax::swing::text::TextAction
+{
+
+public:
+  DefaultEditorKit$BeepAction();
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$BeepAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$BeginAction.h b/libjava/javax/swing/text/DefaultEditorKit$BeginAction.h
new file mode 100644
index 000000000..c208fa266
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$BeginAction.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$BeginAction__
+#define __javax_swing_text_DefaultEditorKit$BeginAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultEditorKit$BeginAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$BeginAction : public ::javax::swing::text::TextAction
+{
+
+public: // actually package-private
+  DefaultEditorKit$BeginAction();
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$BeginAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$BeginLineAction.h b/libjava/javax/swing/text/DefaultEditorKit$BeginLineAction.h
new file mode 100644
index 000000000..5e253e7dc
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$BeginLineAction.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$BeginLineAction__
+#define __javax_swing_text_DefaultEditorKit$BeginLineAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultEditorKit$BeginLineAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$BeginLineAction : public ::javax::swing::text::TextAction
+{
+
+public: // actually package-private
+  DefaultEditorKit$BeginLineAction();
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$BeginLineAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$BeginWordAction.h b/libjava/javax/swing/text/DefaultEditorKit$BeginWordAction.h
new file mode 100644
index 000000000..24494a801
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$BeginWordAction.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$BeginWordAction__
+#define __javax_swing_text_DefaultEditorKit$BeginWordAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultEditorKit$BeginWordAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$BeginWordAction : public ::javax::swing::text::TextAction
+{
+
+public: // actually package-private
+  DefaultEditorKit$BeginWordAction();
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$BeginWordAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$CopyAction.h b/libjava/javax/swing/text/DefaultEditorKit$CopyAction.h
new file mode 100644
index 000000000..30e8dc2f0
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$CopyAction.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$CopyAction__
+#define __javax_swing_text_DefaultEditorKit$CopyAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultEditorKit$CopyAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$CopyAction : public ::javax::swing::text::TextAction
+{
+
+public:
+  DefaultEditorKit$CopyAction();
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$CopyAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$CutAction.h b/libjava/javax/swing/text/DefaultEditorKit$CutAction.h
new file mode 100644
index 000000000..603d16857
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$CutAction.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$CutAction__
+#define __javax_swing_text_DefaultEditorKit$CutAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultEditorKit$CutAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$CutAction : public ::javax::swing::text::TextAction
+{
+
+public:
+  DefaultEditorKit$CutAction();
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$CutAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$DefaultKeyTypedAction.h b/libjava/javax/swing/text/DefaultEditorKit$DefaultKeyTypedAction.h
new file mode 100644
index 000000000..a467b07c0
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$DefaultKeyTypedAction.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$DefaultKeyTypedAction__
+#define __javax_swing_text_DefaultEditorKit$DefaultKeyTypedAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultEditorKit$DefaultKeyTypedAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$DefaultKeyTypedAction : public ::javax::swing::text::TextAction
+{
+
+public:
+  DefaultEditorKit$DefaultKeyTypedAction();
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$DefaultKeyTypedAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$DeleteNextCharAction.h b/libjava/javax/swing/text/DefaultEditorKit$DeleteNextCharAction.h
new file mode 100644
index 000000000..b623fa55f
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$DeleteNextCharAction.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$DeleteNextCharAction__
+#define __javax_swing_text_DefaultEditorKit$DeleteNextCharAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultEditorKit$DeleteNextCharAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$DeleteNextCharAction : public ::javax::swing::text::TextAction
+{
+
+public: // actually package-private
+  DefaultEditorKit$DeleteNextCharAction();
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$DeleteNextCharAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$DeletePrevCharAction.h b/libjava/javax/swing/text/DefaultEditorKit$DeletePrevCharAction.h
new file mode 100644
index 000000000..9e4f2bf6d
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$DeletePrevCharAction.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$DeletePrevCharAction__
+#define __javax_swing_text_DefaultEditorKit$DeletePrevCharAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultEditorKit$DeletePrevCharAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$DeletePrevCharAction : public ::javax::swing::text::TextAction
+{
+
+public: // actually package-private
+  DefaultEditorKit$DeletePrevCharAction();
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$DeletePrevCharAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$DownAction.h b/libjava/javax/swing/text/DefaultEditorKit$DownAction.h
new file mode 100644
index 000000000..facbd833b
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$DownAction.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$DownAction__
+#define __javax_swing_text_DefaultEditorKit$DownAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction$VerticalMovementAction.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Caret;
+          class DefaultEditorKit$DownAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$DownAction : public ::javax::swing::text::TextAction$VerticalMovementAction
+{
+
+public: // actually package-private
+  DefaultEditorKit$DownAction();
+public: // actually protected
+  virtual void actionPerformedImpl(::javax::swing::text::Caret *, jint);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$DownAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$EndAction.h b/libjava/javax/swing/text/DefaultEditorKit$EndAction.h
new file mode 100644
index 000000000..b2cedfe98
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$EndAction.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$EndAction__
+#define __javax_swing_text_DefaultEditorKit$EndAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultEditorKit$EndAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$EndAction : public ::javax::swing::text::TextAction
+{
+
+public: // actually package-private
+  DefaultEditorKit$EndAction();
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$EndAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$EndLineAction.h b/libjava/javax/swing/text/DefaultEditorKit$EndLineAction.h
new file mode 100644
index 000000000..907656700
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$EndLineAction.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$EndLineAction__
+#define __javax_swing_text_DefaultEditorKit$EndLineAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultEditorKit$EndLineAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$EndLineAction : public ::javax::swing::text::TextAction
+{
+
+public: // actually package-private
+  DefaultEditorKit$EndLineAction();
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$EndLineAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$EndWordAction.h b/libjava/javax/swing/text/DefaultEditorKit$EndWordAction.h
new file mode 100644
index 000000000..252a77ab1
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$EndWordAction.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$EndWordAction__
+#define __javax_swing_text_DefaultEditorKit$EndWordAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultEditorKit$EndWordAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$EndWordAction : public ::javax::swing::text::TextAction
+{
+
+public: // actually package-private
+  DefaultEditorKit$EndWordAction();
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$EndWordAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$ForwardAction.h b/libjava/javax/swing/text/DefaultEditorKit$ForwardAction.h
new file mode 100644
index 000000000..3c3c7cfd1
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$ForwardAction.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$ForwardAction__
+#define __javax_swing_text_DefaultEditorKit$ForwardAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction$HorizontalMovementAction.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Caret;
+          class DefaultEditorKit$ForwardAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$ForwardAction : public ::javax::swing::text::TextAction$HorizontalMovementAction
+{
+
+public: // actually package-private
+  DefaultEditorKit$ForwardAction();
+public: // actually protected
+  virtual void actionPerformedImpl(::javax::swing::text::Caret *, jint);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$ForwardAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$InsertBreakAction.h b/libjava/javax/swing/text/DefaultEditorKit$InsertBreakAction.h
new file mode 100644
index 000000000..173b4b18d
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$InsertBreakAction.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$InsertBreakAction__
+#define __javax_swing_text_DefaultEditorKit$InsertBreakAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultEditorKit$InsertBreakAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$InsertBreakAction : public ::javax::swing::text::TextAction
+{
+
+public:
+  DefaultEditorKit$InsertBreakAction();
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$InsertBreakAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$InsertContentAction.h b/libjava/javax/swing/text/DefaultEditorKit$InsertContentAction.h
new file mode 100644
index 000000000..98d77fa17
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$InsertContentAction.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$InsertContentAction__
+#define __javax_swing_text_DefaultEditorKit$InsertContentAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultEditorKit$InsertContentAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$InsertContentAction : public ::javax::swing::text::TextAction
+{
+
+public:
+  DefaultEditorKit$InsertContentAction();
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$InsertContentAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$InsertTabAction.h b/libjava/javax/swing/text/DefaultEditorKit$InsertTabAction.h
new file mode 100644
index 000000000..6201db686
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$InsertTabAction.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$InsertTabAction__
+#define __javax_swing_text_DefaultEditorKit$InsertTabAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultEditorKit$InsertTabAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$InsertTabAction : public ::javax::swing::text::TextAction
+{
+
+public:
+  DefaultEditorKit$InsertTabAction();
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$InsertTabAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$NextWordAction.h b/libjava/javax/swing/text/DefaultEditorKit$NextWordAction.h
new file mode 100644
index 000000000..eedad5f0d
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$NextWordAction.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$NextWordAction__
+#define __javax_swing_text_DefaultEditorKit$NextWordAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultEditorKit$NextWordAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$NextWordAction : public ::javax::swing::text::TextAction
+{
+
+public: // actually package-private
+  DefaultEditorKit$NextWordAction();
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$NextWordAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$PasteAction.h b/libjava/javax/swing/text/DefaultEditorKit$PasteAction.h
new file mode 100644
index 000000000..2a0764c7a
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$PasteAction.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$PasteAction__
+#define __javax_swing_text_DefaultEditorKit$PasteAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultEditorKit$PasteAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$PasteAction : public ::javax::swing::text::TextAction
+{
+
+public:
+  DefaultEditorKit$PasteAction();
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$PasteAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$PreviousWordAction.h b/libjava/javax/swing/text/DefaultEditorKit$PreviousWordAction.h
new file mode 100644
index 000000000..6d7f529cd
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$PreviousWordAction.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$PreviousWordAction__
+#define __javax_swing_text_DefaultEditorKit$PreviousWordAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultEditorKit$PreviousWordAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$PreviousWordAction : public ::javax::swing::text::TextAction
+{
+
+public: // actually package-private
+  DefaultEditorKit$PreviousWordAction();
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$PreviousWordAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectAllAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectAllAction.h
new file mode 100644
index 000000000..7286cd079
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$SelectAllAction.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$SelectAllAction__
+#define __javax_swing_text_DefaultEditorKit$SelectAllAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultEditorKit$SelectAllAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$SelectAllAction : public ::javax::swing::text::TextAction
+{
+
+public: // actually package-private
+  DefaultEditorKit$SelectAllAction();
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$SelectAllAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectLineAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectLineAction.h
new file mode 100644
index 000000000..390f7db28
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$SelectLineAction.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$SelectLineAction__
+#define __javax_swing_text_DefaultEditorKit$SelectLineAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultEditorKit$SelectLineAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$SelectLineAction : public ::javax::swing::text::TextAction
+{
+
+public: // actually package-private
+  DefaultEditorKit$SelectLineAction();
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$SelectLineAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectWordAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectWordAction.h
new file mode 100644
index 000000000..bc33182b6
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$SelectWordAction.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$SelectWordAction__
+#define __javax_swing_text_DefaultEditorKit$SelectWordAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultEditorKit$SelectWordAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$SelectWordAction : public ::javax::swing::text::TextAction
+{
+
+public: // actually package-private
+  DefaultEditorKit$SelectWordAction();
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$SelectWordAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectionBackwardAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectionBackwardAction.h
new file mode 100644
index 000000000..3417cebb2
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$SelectionBackwardAction.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$SelectionBackwardAction__
+#define __javax_swing_text_DefaultEditorKit$SelectionBackwardAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction$HorizontalMovementAction.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Caret;
+          class DefaultEditorKit$SelectionBackwardAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$SelectionBackwardAction : public ::javax::swing::text::TextAction$HorizontalMovementAction
+{
+
+public: // actually package-private
+  DefaultEditorKit$SelectionBackwardAction();
+public: // actually protected
+  virtual void actionPerformedImpl(::javax::swing::text::Caret *, jint);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$SelectionBackwardAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectionBeginAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectionBeginAction.h
new file mode 100644
index 000000000..e0f68eb2e
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$SelectionBeginAction.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$SelectionBeginAction__
+#define __javax_swing_text_DefaultEditorKit$SelectionBeginAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultEditorKit$SelectionBeginAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$SelectionBeginAction : public ::javax::swing::text::TextAction
+{
+
+public: // actually package-private
+  DefaultEditorKit$SelectionBeginAction();
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$SelectionBeginAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectionBeginLineAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectionBeginLineAction.h
new file mode 100644
index 000000000..d8b57669c
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$SelectionBeginLineAction.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$SelectionBeginLineAction__
+#define __javax_swing_text_DefaultEditorKit$SelectionBeginLineAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultEditorKit$SelectionBeginLineAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$SelectionBeginLineAction : public ::javax::swing::text::TextAction
+{
+
+public: // actually package-private
+  DefaultEditorKit$SelectionBeginLineAction();
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$SelectionBeginLineAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectionBeginWordAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectionBeginWordAction.h
new file mode 100644
index 000000000..fa85b3451
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$SelectionBeginWordAction.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$SelectionBeginWordAction__
+#define __javax_swing_text_DefaultEditorKit$SelectionBeginWordAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultEditorKit$SelectionBeginWordAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$SelectionBeginWordAction : public ::javax::swing::text::TextAction
+{
+
+public: // actually package-private
+  DefaultEditorKit$SelectionBeginWordAction();
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$SelectionBeginWordAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectionDownAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectionDownAction.h
new file mode 100644
index 000000000..5e005df8b
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$SelectionDownAction.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$SelectionDownAction__
+#define __javax_swing_text_DefaultEditorKit$SelectionDownAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction$VerticalMovementAction.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Caret;
+          class DefaultEditorKit$SelectionDownAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$SelectionDownAction : public ::javax::swing::text::TextAction$VerticalMovementAction
+{
+
+public: // actually package-private
+  DefaultEditorKit$SelectionDownAction();
+public: // actually protected
+  virtual void actionPerformedImpl(::javax::swing::text::Caret *, jint);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$SelectionDownAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectionEndAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectionEndAction.h
new file mode 100644
index 000000000..b1b03cdbb
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$SelectionEndAction.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$SelectionEndAction__
+#define __javax_swing_text_DefaultEditorKit$SelectionEndAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultEditorKit$SelectionEndAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$SelectionEndAction : public ::javax::swing::text::TextAction
+{
+
+public: // actually package-private
+  DefaultEditorKit$SelectionEndAction();
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$SelectionEndAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectionEndLineAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectionEndLineAction.h
new file mode 100644
index 000000000..2ff14cb78
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$SelectionEndLineAction.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$SelectionEndLineAction__
+#define __javax_swing_text_DefaultEditorKit$SelectionEndLineAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultEditorKit$SelectionEndLineAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$SelectionEndLineAction : public ::javax::swing::text::TextAction
+{
+
+public: // actually package-private
+  DefaultEditorKit$SelectionEndLineAction();
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$SelectionEndLineAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectionEndWordAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectionEndWordAction.h
new file mode 100644
index 000000000..5bb3b47c2
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$SelectionEndWordAction.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$SelectionEndWordAction__
+#define __javax_swing_text_DefaultEditorKit$SelectionEndWordAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultEditorKit$SelectionEndWordAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$SelectionEndWordAction : public ::javax::swing::text::TextAction
+{
+
+public: // actually package-private
+  DefaultEditorKit$SelectionEndWordAction();
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$SelectionEndWordAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectionForwardAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectionForwardAction.h
new file mode 100644
index 000000000..8447af6a3
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$SelectionForwardAction.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$SelectionForwardAction__
+#define __javax_swing_text_DefaultEditorKit$SelectionForwardAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction$HorizontalMovementAction.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Caret;
+          class DefaultEditorKit$SelectionForwardAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$SelectionForwardAction : public ::javax::swing::text::TextAction$HorizontalMovementAction
+{
+
+public: // actually package-private
+  DefaultEditorKit$SelectionForwardAction();
+public: // actually protected
+  virtual void actionPerformedImpl(::javax::swing::text::Caret *, jint);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$SelectionForwardAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectionNextWordAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectionNextWordAction.h
new file mode 100644
index 000000000..1647d7c42
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$SelectionNextWordAction.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$SelectionNextWordAction__
+#define __javax_swing_text_DefaultEditorKit$SelectionNextWordAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultEditorKit$SelectionNextWordAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$SelectionNextWordAction : public ::javax::swing::text::TextAction
+{
+
+public: // actually package-private
+  DefaultEditorKit$SelectionNextWordAction();
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$SelectionNextWordAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectionPreviousWordAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectionPreviousWordAction.h
new file mode 100644
index 000000000..5257dafe6
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$SelectionPreviousWordAction.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$SelectionPreviousWordAction__
+#define __javax_swing_text_DefaultEditorKit$SelectionPreviousWordAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultEditorKit$SelectionPreviousWordAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$SelectionPreviousWordAction : public ::javax::swing::text::TextAction
+{
+
+public: // actually package-private
+  DefaultEditorKit$SelectionPreviousWordAction();
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$SelectionPreviousWordAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectionUpAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectionUpAction.h
new file mode 100644
index 000000000..9d5b3f41c
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$SelectionUpAction.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$SelectionUpAction__
+#define __javax_swing_text_DefaultEditorKit$SelectionUpAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction$VerticalMovementAction.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Caret;
+          class DefaultEditorKit$SelectionUpAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$SelectionUpAction : public ::javax::swing::text::TextAction$VerticalMovementAction
+{
+
+public: // actually package-private
+  DefaultEditorKit$SelectionUpAction();
+public: // actually protected
+  virtual void actionPerformedImpl(::javax::swing::text::Caret *, jint);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$SelectionUpAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$UpAction.h b/libjava/javax/swing/text/DefaultEditorKit$UpAction.h
new file mode 100644
index 000000000..e2cc3eaa7
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit$UpAction.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit$UpAction__
+#define __javax_swing_text_DefaultEditorKit$UpAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction$VerticalMovementAction.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Caret;
+          class DefaultEditorKit$UpAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit$UpAction : public ::javax::swing::text::TextAction$VerticalMovementAction
+{
+
+public: // actually package-private
+  DefaultEditorKit$UpAction();
+public: // actually protected
+  virtual void actionPerformedImpl(::javax::swing::text::Caret *, jint);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit$UpAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit.h b/libjava/javax/swing/text/DefaultEditorKit.h
new file mode 100644
index 000000000..281960937
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultEditorKit.h
@@ -0,0 +1,100 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultEditorKit__
+#define __javax_swing_text_DefaultEditorKit__
+
+#pragma interface
+
+#include <javax/swing/text/EditorKit.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class Action;
+      namespace text
+      {
+          class Caret;
+          class DefaultEditorKit;
+          class Document;
+          class ViewFactory;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultEditorKit : public ::javax::swing::text::EditorKit
+{
+
+public:
+  DefaultEditorKit();
+  virtual ::javax::swing::text::Caret * createCaret();
+  virtual ::javax::swing::text::Document * createDefaultDocument();
+  virtual JArray< ::javax::swing::Action * > * getActions();
+  virtual ::java::lang::String * getContentType();
+  virtual ::javax::swing::text::ViewFactory * getViewFactory();
+  virtual void read(::java::io::InputStream *, ::javax::swing::text::Document *, jint);
+  virtual void read(::java::io::Reader *, ::javax::swing::text::Document *, jint);
+  virtual void write(::java::io::OutputStream *, ::javax::swing::text::Document *, jint, jint);
+  virtual void write(::java::io::Writer *, ::javax::swing::text::Document *, jint, jint);
+private:
+  static const jlong serialVersionUID = 9017245433028523428LL;
+public:
+  static ::java::lang::String * backwardAction;
+  static ::java::lang::String * beepAction;
+  static ::java::lang::String * beginAction;
+  static ::java::lang::String * beginLineAction;
+  static ::java::lang::String * beginParagraphAction;
+  static ::java::lang::String * beginWordAction;
+  static ::java::lang::String * copyAction;
+  static ::java::lang::String * cutAction;
+  static ::java::lang::String * defaultKeyTypedAction;
+  static ::java::lang::String * deleteNextCharAction;
+  static ::java::lang::String * deletePrevCharAction;
+  static ::java::lang::String * downAction;
+  static ::java::lang::String * endAction;
+  static ::java::lang::String * endLineAction;
+  static ::java::lang::String * EndOfLineStringProperty;
+  static ::java::lang::String * endParagraphAction;
+  static ::java::lang::String * endWordAction;
+  static ::java::lang::String * forwardAction;
+  static ::java::lang::String * insertBreakAction;
+  static ::java::lang::String * insertContentAction;
+  static ::java::lang::String * insertTabAction;
+  static ::java::lang::String * nextWordAction;
+  static ::java::lang::String * pageDownAction;
+  static ::java::lang::String * pageUpAction;
+  static ::java::lang::String * pasteAction;
+  static ::java::lang::String * previousWordAction;
+  static ::java::lang::String * readOnlyAction;
+  static ::java::lang::String * selectAllAction;
+  static ::java::lang::String * selectionBackwardAction;
+  static ::java::lang::String * selectionBeginAction;
+  static ::java::lang::String * selectionBeginLineAction;
+  static ::java::lang::String * selectionBeginParagraphAction;
+  static ::java::lang::String * selectionBeginWordAction;
+  static ::java::lang::String * selectionDownAction;
+  static ::java::lang::String * selectionEndAction;
+  static ::java::lang::String * selectionEndLineAction;
+  static ::java::lang::String * selectionEndParagraphAction;
+  static ::java::lang::String * selectionEndWordAction;
+  static ::java::lang::String * selectionForwardAction;
+  static ::java::lang::String * selectionNextWordAction;
+  static ::java::lang::String * selectionPreviousWordAction;
+  static ::java::lang::String * selectionUpAction;
+  static ::java::lang::String * selectLineAction;
+  static ::java::lang::String * selectParagraphAction;
+  static ::java::lang::String * selectWordAction;
+  static ::java::lang::String * upAction;
+  static ::java::lang::String * writableAction;
+private:
+  static JArray< ::javax::swing::Action * > * defaultActions;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultEditorKit__
diff --git a/libjava/javax/swing/text/DefaultFormatter$FormatterDocumentFilter.h b/libjava/javax/swing/text/DefaultFormatter$FormatterDocumentFilter.h
new file mode 100644
index 000000000..090ade493
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultFormatter$FormatterDocumentFilter.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultFormatter$FormatterDocumentFilter__
+#define __javax_swing_text_DefaultFormatter$FormatterDocumentFilter__
+
+#pragma interface
+
+#include <javax/swing/text/DocumentFilter.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AttributeSet;
+          class DefaultFormatter;
+          class DefaultFormatter$FormatterDocumentFilter;
+          class DocumentFilter$FilterBypass;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultFormatter$FormatterDocumentFilter : public ::javax::swing::text::DocumentFilter
+{
+
+  DefaultFormatter$FormatterDocumentFilter(::javax::swing::text::DefaultFormatter *);
+public:
+  virtual void remove(::javax::swing::text::DocumentFilter$FilterBypass *, jint, jint);
+  virtual void insertString(::javax::swing::text::DocumentFilter$FilterBypass *, jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *);
+  virtual void replace(::javax::swing::text::DocumentFilter$FilterBypass *, jint, jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *);
+private:
+  void commitIfAllowed();
+  void checkValidInput();
+public: // actually package-private
+  DefaultFormatter$FormatterDocumentFilter(::javax::swing::text::DefaultFormatter *, ::javax::swing::text::DefaultFormatter$FormatterDocumentFilter *);
+  ::javax::swing::text::DefaultFormatter * __attribute__((aligned(__alignof__( ::javax::swing::text::DocumentFilter)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultFormatter$FormatterDocumentFilter__
diff --git a/libjava/javax/swing/text/DefaultFormatter.h b/libjava/javax/swing/text/DefaultFormatter.h
new file mode 100644
index 000000000..858a1efca
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultFormatter.h
@@ -0,0 +1,58 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultFormatter__
+#define __javax_swing_text_DefaultFormatter__
+
+#pragma interface
+
+#include <javax/swing/JFormattedTextField$AbstractFormatter.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JFormattedTextField;
+      namespace text
+      {
+          class DefaultFormatter;
+          class DocumentFilter;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultFormatter : public ::javax::swing::JFormattedTextField$AbstractFormatter
+{
+
+public:
+  DefaultFormatter();
+  virtual void install(::javax::swing::JFormattedTextField *);
+  virtual jboolean getCommitsOnValidEdit();
+  virtual void setCommitsOnValidEdit(jboolean);
+  virtual jboolean getOverwriteMode();
+  virtual void setOverwriteMode(jboolean);
+  virtual jboolean getAllowsInvalid();
+  virtual void setAllowsInvalid(jboolean);
+  virtual ::java::lang::Class * getValueClass();
+  virtual void setValueClass(::java::lang::Class *);
+  virtual ::java::lang::Object * stringToValue(::java::lang::String *);
+  virtual ::java::lang::String * valueToString(::java::lang::Object *);
+  virtual ::java::lang::Object * clone();
+public: // actually protected
+  virtual ::javax::swing::text::DocumentFilter * getDocumentFilter();
+public: // actually package-private
+  static ::javax::swing::JFormattedTextField * access$0(::javax::swing::text::DefaultFormatter *);
+private:
+  static const jlong serialVersionUID = -355018354457785329LL;
+public: // actually package-private
+  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JFormattedTextField$AbstractFormatter)))) commitsOnValidEdit;
+  jboolean overwriteMode;
+  jboolean allowsInvalid;
+  ::java::lang::Class * valueClass;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultFormatter__
diff --git a/libjava/javax/swing/text/DefaultFormatterFactory.h b/libjava/javax/swing/text/DefaultFormatterFactory.h
new file mode 100644
index 000000000..8e39926a6
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultFormatterFactory.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultFormatterFactory__
+#define __javax_swing_text_DefaultFormatterFactory__
+
+#pragma interface
+
+#include <javax/swing/JFormattedTextField$AbstractFormatterFactory.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JFormattedTextField;
+        class JFormattedTextField$AbstractFormatter;
+      namespace text
+      {
+          class DefaultFormatterFactory;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultFormatterFactory : public ::javax::swing::JFormattedTextField$AbstractFormatterFactory
+{
+
+public:
+  DefaultFormatterFactory();
+  DefaultFormatterFactory(::javax::swing::JFormattedTextField$AbstractFormatter *);
+  DefaultFormatterFactory(::javax::swing::JFormattedTextField$AbstractFormatter *, ::javax::swing::JFormattedTextField$AbstractFormatter *);
+  DefaultFormatterFactory(::javax::swing::JFormattedTextField$AbstractFormatter *, ::javax::swing::JFormattedTextField$AbstractFormatter *, ::javax::swing::JFormattedTextField$AbstractFormatter *);
+  DefaultFormatterFactory(::javax::swing::JFormattedTextField$AbstractFormatter *, ::javax::swing::JFormattedTextField$AbstractFormatter *, ::javax::swing::JFormattedTextField$AbstractFormatter *, ::javax::swing::JFormattedTextField$AbstractFormatter *);
+  virtual ::javax::swing::JFormattedTextField$AbstractFormatter * getDefaultFormatter();
+  virtual void setDefaultFormatter(::javax::swing::JFormattedTextField$AbstractFormatter *);
+  virtual ::javax::swing::JFormattedTextField$AbstractFormatter * getDisplayFormatter();
+  virtual void setDisplayFormatter(::javax::swing::JFormattedTextField$AbstractFormatter *);
+  virtual ::javax::swing::JFormattedTextField$AbstractFormatter * getEditFormatter();
+  virtual void setEditFormatter(::javax::swing::JFormattedTextField$AbstractFormatter *);
+  virtual ::javax::swing::JFormattedTextField$AbstractFormatter * getNullFormatter();
+  virtual void setNullFormatter(::javax::swing::JFormattedTextField$AbstractFormatter *);
+  virtual ::javax::swing::JFormattedTextField$AbstractFormatter * getFormatter(::javax::swing::JFormattedTextField *);
+public: // actually package-private
+  ::javax::swing::JFormattedTextField$AbstractFormatter * __attribute__((aligned(__alignof__( ::javax::swing::JFormattedTextField$AbstractFormatterFactory)))) defaultFormatter;
+  ::javax::swing::JFormattedTextField$AbstractFormatter * editFormatter;
+  ::javax::swing::JFormattedTextField$AbstractFormatter * displayFormatter;
+  ::javax::swing::JFormattedTextField$AbstractFormatter * nullFormatter;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultFormatterFactory__
diff --git a/libjava/javax/swing/text/DefaultHighlighter$DefaultHighlightPainter.h b/libjava/javax/swing/text/DefaultHighlighter$DefaultHighlightPainter.h
new file mode 100644
index 000000000..0baecc9c0
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultHighlighter$DefaultHighlightPainter.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultHighlighter$DefaultHighlightPainter__
+#define __javax_swing_text_DefaultHighlighter$DefaultHighlightPainter__
+
+#pragma interface
+
+#include <javax/swing/text/LayeredHighlighter$LayerPainter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Graphics;
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultHighlighter$DefaultHighlightPainter;
+          class JTextComponent;
+          class View;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultHighlighter$DefaultHighlightPainter : public ::javax::swing::text::LayeredHighlighter$LayerPainter
+{
+
+public:
+  DefaultHighlighter$DefaultHighlightPainter(::java::awt::Color *);
+  virtual ::java::awt::Color * getColor();
+  virtual void paint(::java::awt::Graphics *, jint, jint, ::java::awt::Shape *, ::javax::swing::text::JTextComponent *);
+  virtual ::java::awt::Shape * paintLayer(::java::awt::Graphics *, jint, jint, ::java::awt::Shape *, ::javax::swing::text::JTextComponent *, ::javax::swing::text::View *);
+private:
+  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::text::LayeredHighlighter$LayerPainter)))) color;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultHighlighter$DefaultHighlightPainter__
diff --git a/libjava/javax/swing/text/DefaultHighlighter$HighlightEntry.h b/libjava/javax/swing/text/DefaultHighlighter$HighlightEntry.h
new file mode 100644
index 000000000..439d60491
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultHighlighter$HighlightEntry.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultHighlighter$HighlightEntry__
+#define __javax_swing_text_DefaultHighlighter$HighlightEntry__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultHighlighter;
+          class DefaultHighlighter$HighlightEntry;
+          class Highlighter$HighlightPainter;
+          class Position;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultHighlighter$HighlightEntry : public ::java::lang::Object
+{
+
+public:
+  DefaultHighlighter$HighlightEntry(::javax::swing::text::DefaultHighlighter *, ::javax::swing::text::Position *, ::javax::swing::text::Position *, ::javax::swing::text::Highlighter$HighlightPainter *);
+  virtual jint getStartOffset();
+  virtual jint getEndOffset();
+  virtual ::javax::swing::text::Highlighter$HighlightPainter * getPainter();
+public: // actually package-private
+  ::javax::swing::text::Position * __attribute__((aligned(__alignof__( ::java::lang::Object)))) p0;
+  ::javax::swing::text::Position * p1;
+  ::javax::swing::text::Highlighter$HighlightPainter * painter;
+  ::javax::swing::text::DefaultHighlighter * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultHighlighter$HighlightEntry__
diff --git a/libjava/javax/swing/text/DefaultHighlighter$LayerHighlightEntry.h b/libjava/javax/swing/text/DefaultHighlighter$LayerHighlightEntry.h
new file mode 100644
index 000000000..15220e242
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultHighlighter$LayerHighlightEntry.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultHighlighter$LayerHighlightEntry__
+#define __javax_swing_text_DefaultHighlighter$LayerHighlightEntry__
+
+#pragma interface
+
+#include <javax/swing/text/DefaultHighlighter$HighlightEntry.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+        class Rectangle;
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultHighlighter;
+          class DefaultHighlighter$LayerHighlightEntry;
+          class Highlighter$HighlightPainter;
+          class JTextComponent;
+          class Position;
+          class View;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultHighlighter$LayerHighlightEntry : public ::javax::swing::text::DefaultHighlighter$HighlightEntry
+{
+
+public: // actually package-private
+  DefaultHighlighter$LayerHighlightEntry(::javax::swing::text::DefaultHighlighter *, ::javax::swing::text::Position *, ::javax::swing::text::Position *, ::javax::swing::text::Highlighter$HighlightPainter *);
+  virtual void paintLayeredHighlight(::java::awt::Graphics *, jint, jint, ::java::awt::Shape *, ::javax::swing::text::JTextComponent *, ::javax::swing::text::View *);
+  ::java::awt::Rectangle * __attribute__((aligned(__alignof__( ::javax::swing::text::DefaultHighlighter$HighlightEntry)))) paintRect;
+  ::javax::swing::text::DefaultHighlighter * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultHighlighter$LayerHighlightEntry__
diff --git a/libjava/javax/swing/text/DefaultHighlighter.h b/libjava/javax/swing/text/DefaultHighlighter.h
new file mode 100644
index 000000000..a237a1312
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultHighlighter.h
@@ -0,0 +1,67 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultHighlighter__
+#define __javax_swing_text_DefaultHighlighter__
+
+#pragma interface
+
+#include <javax/swing/text/LayeredHighlighter.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultHighlighter;
+          class Highlighter$Highlight;
+          class Highlighter$HighlightPainter;
+          class JTextComponent;
+          class LayeredHighlighter$LayerPainter;
+          class View;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultHighlighter : public ::javax::swing::text::LayeredHighlighter
+{
+
+public:
+  DefaultHighlighter();
+  virtual jboolean getDrawsLayeredHighlights();
+  virtual void setDrawsLayeredHighlights(jboolean);
+private:
+  void checkPositions(jint, jint);
+public:
+  virtual void install(::javax::swing::text::JTextComponent *);
+  virtual void deinstall(::javax::swing::text::JTextComponent *);
+  virtual ::java::lang::Object * addHighlight(jint, jint, ::javax::swing::text::Highlighter$HighlightPainter *);
+  virtual void removeHighlight(::java::lang::Object *);
+  virtual void removeAllHighlights();
+  virtual JArray< ::javax::swing::text::Highlighter$Highlight * > * getHighlights();
+  virtual void changeHighlight(::java::lang::Object *, jint, jint);
+  virtual void paintLayeredHighlights(::java::awt::Graphics *, jint, jint, ::java::awt::Shape *, ::javax::swing::text::JTextComponent *, ::javax::swing::text::View *);
+  virtual void paint(::java::awt::Graphics *);
+  static ::javax::swing::text::LayeredHighlighter$LayerPainter * DefaultPainter;
+private:
+  ::javax::swing::text::JTextComponent * __attribute__((aligned(__alignof__( ::javax::swing::text::LayeredHighlighter)))) textComponent;
+  ::java::util::ArrayList * highlights;
+  jboolean drawsLayeredHighlights;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultHighlighter__
diff --git a/libjava/javax/swing/text/DefaultStyledDocument$AttributeUndoableEdit.h b/libjava/javax/swing/text/DefaultStyledDocument$AttributeUndoableEdit.h
new file mode 100644
index 000000000..ebaf8caa8
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultStyledDocument$AttributeUndoableEdit.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultStyledDocument$AttributeUndoableEdit__
+#define __javax_swing_text_DefaultStyledDocument$AttributeUndoableEdit__
+
+#pragma interface
+
+#include <javax/swing/undo/AbstractUndoableEdit.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AttributeSet;
+          class DefaultStyledDocument$AttributeUndoableEdit;
+          class Element;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultStyledDocument$AttributeUndoableEdit : public ::javax::swing::undo::AbstractUndoableEdit
+{
+
+public:
+  DefaultStyledDocument$AttributeUndoableEdit(::javax::swing::text::Element *, ::javax::swing::text::AttributeSet *, jboolean);
+  virtual void undo();
+  virtual void redo();
+public: // actually protected
+  ::javax::swing::text::AttributeSet * __attribute__((aligned(__alignof__( ::javax::swing::undo::AbstractUndoableEdit)))) copy;
+  ::javax::swing::text::AttributeSet * newAttributes;
+  jboolean isReplacing;
+  ::javax::swing::text::Element * element;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultStyledDocument$AttributeUndoableEdit__
diff --git a/libjava/javax/swing/text/DefaultStyledDocument$ElementBuffer$Edit.h b/libjava/javax/swing/text/DefaultStyledDocument$ElementBuffer$Edit.h
new file mode 100644
index 000000000..628569976
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultStyledDocument$ElementBuffer$Edit.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultStyledDocument$ElementBuffer$Edit__
+#define __javax_swing_text_DefaultStyledDocument$ElementBuffer$Edit__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultStyledDocument$ElementBuffer;
+          class DefaultStyledDocument$ElementBuffer$Edit;
+          class Element;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultStyledDocument$ElementBuffer$Edit : public ::java::lang::Object
+{
+
+public: // actually package-private
+  DefaultStyledDocument$ElementBuffer$Edit(::javax::swing::text::DefaultStyledDocument$ElementBuffer *, ::javax::swing::text::Element *, jint);
+  DefaultStyledDocument$ElementBuffer$Edit(::javax::swing::text::DefaultStyledDocument$ElementBuffer *, ::javax::swing::text::Element *, jint, jboolean);
+  ::javax::swing::text::Element * __attribute__((aligned(__alignof__( ::java::lang::Object)))) e;
+  jint index;
+  ::java::util::ArrayList * removed;
+  ::java::util::ArrayList * added;
+  jboolean isFracture;
+  ::javax::swing::text::DefaultStyledDocument$ElementBuffer * this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultStyledDocument$ElementBuffer$Edit__
diff --git a/libjava/javax/swing/text/DefaultStyledDocument$ElementBuffer.h b/libjava/javax/swing/text/DefaultStyledDocument$ElementBuffer.h
new file mode 100644
index 000000000..17151db0e
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultStyledDocument$ElementBuffer.h
@@ -0,0 +1,93 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultStyledDocument$ElementBuffer__
+#define __javax_swing_text_DefaultStyledDocument$ElementBuffer__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AbstractDocument$DefaultDocumentEvent;
+          class DefaultStyledDocument;
+          class DefaultStyledDocument$ElementBuffer;
+          class DefaultStyledDocument$ElementBuffer$Edit;
+          class DefaultStyledDocument$ElementSpec;
+          class Element;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultStyledDocument$ElementBuffer : public ::java::lang::Object
+{
+
+public:
+  DefaultStyledDocument$ElementBuffer(::javax::swing::text::DefaultStyledDocument *, ::javax::swing::text::Element *);
+  virtual ::javax::swing::text::Element * getRootElement();
+  virtual void remove(jint, jint, ::javax::swing::text::AbstractDocument$DefaultDocumentEvent *);
+public: // actually protected
+  virtual void removeUpdate();
+private:
+  jboolean removeElements(::javax::swing::text::Element *, jint, jint);
+public: // actually package-private
+  virtual void create(jint, JArray< ::javax::swing::text::DefaultStyledDocument$ElementSpec * > *, ::javax::swing::text::AbstractDocument$DefaultDocumentEvent *);
+private:
+  jboolean canJoin(::javax::swing::text::Element *, ::javax::swing::text::Element *);
+  ::javax::swing::text::Element * join(::javax::swing::text::Element *, ::javax::swing::text::Element *, ::javax::swing::text::Element *, jint, jint);
+public: // actually protected
+  virtual void changeUpdate();
+public:
+  virtual void change(jint, jint, ::javax::swing::text::AbstractDocument$DefaultDocumentEvent *);
+  virtual ::javax::swing::text::Element * clone(::javax::swing::text::Element *, ::javax::swing::text::Element *);
+private:
+  ::javax::swing::text::Element * cloneAsNecessary(::javax::swing::text::Element *, ::javax::swing::text::Element *, jint, jint);
+public:
+  virtual void insert(jint, jint, JArray< ::javax::swing::text::DefaultStyledDocument$ElementSpec * > *, ::javax::swing::text::AbstractDocument$DefaultDocumentEvent *);
+private:
+  void prepareEdit(jint, jint);
+  void finishEdit(::javax::swing::text::AbstractDocument$DefaultDocumentEvent *);
+public: // actually protected
+  virtual void insertUpdate(JArray< ::javax::swing::text::DefaultStyledDocument$ElementSpec * > *);
+private:
+  void pop();
+  void insertElement(::javax::swing::text::DefaultStyledDocument$ElementSpec *);
+  void insertFirstContentTag(JArray< ::javax::swing::text::DefaultStyledDocument$ElementSpec * > *);
+  void insertContentTag(::javax::swing::text::DefaultStyledDocument$ElementSpec *, ::javax::swing::text::DefaultStyledDocument$ElementBuffer$Edit *);
+  void createFracture(JArray< ::javax::swing::text::DefaultStyledDocument$ElementSpec * > *);
+  void fracture(jint);
+  void recreate(jint, jint);
+  ::javax::swing::text::Element * recreateFracturedElement(::javax::swing::text::Element *, ::javax::swing::text::Element *);
+  jboolean split(jint, jint);
+  static const jlong serialVersionUID = 1688745877691146623LL;
+  ::javax::swing::text::Element * __attribute__((aligned(__alignof__( ::java::lang::Object)))) root;
+  jint offset;
+  jint endOffset;
+  jint length;
+  jint pos;
+  ::javax::swing::text::Element * fracturedParent;
+  ::javax::swing::text::Element * fracturedChild;
+  jboolean createdFracture;
+  ::java::util::Stack * elementStack;
+  JArray< ::javax::swing::text::DefaultStyledDocument$ElementBuffer$Edit * > * insertPath;
+  jboolean recreateLeafs;
+  ::java::util::ArrayList * edits;
+  jboolean offsetLastIndex;
+  jboolean offsetLastIndexReplace;
+public: // actually package-private
+  ::javax::swing::text::DefaultStyledDocument * this$0;
+  static jboolean $assertionsDisabled;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultStyledDocument$ElementBuffer__
diff --git a/libjava/javax/swing/text/DefaultStyledDocument$ElementSpec.h b/libjava/javax/swing/text/DefaultStyledDocument$ElementSpec.h
new file mode 100644
index 000000000..7c2433411
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultStyledDocument$ElementSpec.h
@@ -0,0 +1,61 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultStyledDocument$ElementSpec__
+#define __javax_swing_text_DefaultStyledDocument$ElementSpec__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AttributeSet;
+          class DefaultStyledDocument$ElementSpec;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultStyledDocument$ElementSpec : public ::java::lang::Object
+{
+
+public:
+  DefaultStyledDocument$ElementSpec(::javax::swing::text::AttributeSet *, jshort);
+  DefaultStyledDocument$ElementSpec(::javax::swing::text::AttributeSet *, jshort, jint);
+  DefaultStyledDocument$ElementSpec(::javax::swing::text::AttributeSet *, jshort, JArray< jchar > *, jint, jint);
+  virtual void setType(jshort);
+  virtual jshort getType();
+  virtual void setDirection(jshort);
+  virtual jshort getDirection();
+  virtual ::javax::swing::text::AttributeSet * getAttributes();
+  virtual JArray< jchar > * getArray();
+  virtual jint getOffset();
+  virtual jint getLength();
+  virtual ::java::lang::String * toString();
+  static const jshort StartTagType = 1;
+  static const jshort EndTagType = 2;
+  static const jshort ContentType = 3;
+  static const jshort JoinPreviousDirection = 4;
+  static const jshort JoinNextDirection = 5;
+  static const jshort OriginateDirection = 6;
+  static const jshort JoinFractureDirection = 7;
+public: // actually package-private
+  jshort __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
+  jshort direction;
+  jint offset;
+  jint length;
+  JArray< jchar > * content;
+  ::javax::swing::text::AttributeSet * attributes;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultStyledDocument$ElementSpec__
diff --git a/libjava/javax/swing/text/DefaultStyledDocument$SectionElement.h b/libjava/javax/swing/text/DefaultStyledDocument$SectionElement.h
new file mode 100644
index 000000000..969238dc3
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultStyledDocument$SectionElement.h
@@ -0,0 +1,37 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultStyledDocument$SectionElement__
+#define __javax_swing_text_DefaultStyledDocument$SectionElement__
+
+#pragma interface
+
+#include <javax/swing/text/AbstractDocument$BranchElement.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultStyledDocument;
+          class DefaultStyledDocument$SectionElement;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultStyledDocument$SectionElement : public ::javax::swing::text::AbstractDocument$BranchElement
+{
+
+public:
+  DefaultStyledDocument$SectionElement(::javax::swing::text::DefaultStyledDocument *);
+  virtual ::java::lang::String * getName();
+public: // actually package-private
+  ::javax::swing::text::DefaultStyledDocument * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractDocument$BranchElement)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultStyledDocument$SectionElement__
diff --git a/libjava/javax/swing/text/DefaultStyledDocument$StyleChangeListener.h b/libjava/javax/swing/text/DefaultStyledDocument$StyleChangeListener.h
new file mode 100644
index 000000000..e3095acf5
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultStyledDocument$StyleChangeListener.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultStyledDocument$StyleChangeListener__
+#define __javax_swing_text_DefaultStyledDocument$StyleChangeListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ChangeEvent;
+      }
+      namespace text
+      {
+          class DefaultStyledDocument;
+          class DefaultStyledDocument$StyleChangeListener;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultStyledDocument$StyleChangeListener : public ::java::lang::Object
+{
+
+  DefaultStyledDocument$StyleChangeListener(::javax::swing::text::DefaultStyledDocument *);
+public:
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+public: // actually package-private
+  DefaultStyledDocument$StyleChangeListener(::javax::swing::text::DefaultStyledDocument *, ::javax::swing::text::DefaultStyledDocument$StyleChangeListener *);
+  ::javax::swing::text::DefaultStyledDocument * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultStyledDocument$StyleChangeListener__
diff --git a/libjava/javax/swing/text/DefaultStyledDocument.h b/libjava/javax/swing/text/DefaultStyledDocument.h
new file mode 100644
index 000000000..8db689f69
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultStyledDocument.h
@@ -0,0 +1,95 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultStyledDocument__
+#define __javax_swing_text_DefaultStyledDocument__
+
+#pragma interface
+
+#include <javax/swing/text/AbstractDocument.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Font;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AbstractDocument$AbstractElement;
+          class AbstractDocument$Content;
+          class AbstractDocument$DefaultDocumentEvent;
+          class AttributeSet;
+          class DefaultStyledDocument;
+          class DefaultStyledDocument$ElementBuffer;
+          class DefaultStyledDocument$ElementSpec;
+          class DefaultStyledDocument$StyleChangeListener;
+          class Element;
+          class Style;
+          class StyleContext;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultStyledDocument : public ::javax::swing::text::AbstractDocument
+{
+
+public:
+  DefaultStyledDocument();
+  DefaultStyledDocument(::javax::swing::text::StyleContext *);
+  DefaultStyledDocument(::javax::swing::text::AbstractDocument$Content *, ::javax::swing::text::StyleContext *);
+  virtual ::javax::swing::text::Style * addStyle(::java::lang::String *, ::javax::swing::text::Style *);
+public: // actually protected
+  virtual ::javax::swing::text::AbstractDocument$AbstractElement * createDefaultRoot();
+public:
+  virtual ::javax::swing::text::Element * getCharacterElement(jint);
+  virtual ::java::awt::Color * getBackground(::javax::swing::text::AttributeSet *);
+  virtual ::javax::swing::text::Element * getDefaultRootElement();
+  virtual ::java::awt::Font * getFont(::javax::swing::text::AttributeSet *);
+  virtual ::java::awt::Color * getForeground(::javax::swing::text::AttributeSet *);
+  virtual ::javax::swing::text::Style * getLogicalStyle(jint);
+  virtual ::javax::swing::text::Element * getParagraphElement(jint);
+  virtual ::javax::swing::text::Style * getStyle(::java::lang::String *);
+  virtual void removeStyle(::java::lang::String *);
+  virtual void setCharacterAttributes(jint, jint, ::javax::swing::text::AttributeSet *, jboolean);
+  virtual void setLogicalStyle(jint, ::javax::swing::text::Style *);
+  virtual void setParagraphAttributes(jint, jint, ::javax::swing::text::AttributeSet *, jboolean);
+public: // actually protected
+  virtual void insertUpdate(::javax::swing::text::AbstractDocument$DefaultDocumentEvent *, ::javax::swing::text::AttributeSet *);
+private:
+  jshort insertAfterNewline(::javax::swing::text::Element *, ::javax::swing::text::Element *, ::javax::swing::text::AttributeSet *, ::java::util::ArrayList *, jint, jint);
+public: // actually package-private
+  virtual jshort handleInsertAfterNewline(::java::util::Vector *, jint, jint, ::javax::swing::text::Element *, ::javax::swing::text::Element *, ::javax::swing::text::AttributeSet *);
+public: // actually protected
+  virtual void removeUpdate(::javax::swing::text::AbstractDocument$DefaultDocumentEvent *);
+public:
+  virtual ::java::util::Enumeration * getStyleNames();
+public: // actually protected
+  virtual void styleChanged(::javax::swing::text::Style *);
+  virtual void insert(jint, JArray< ::javax::swing::text::DefaultStyledDocument$ElementSpec * > *);
+  virtual void create(JArray< ::javax::swing::text::DefaultStyledDocument$ElementSpec * > *);
+private:
+  static const jlong serialVersionUID = 940485415728614849LL;
+public:
+  static const jint BUFFER_SIZE_DEFAULT = 4096;
+public: // actually protected
+  ::javax::swing::text::DefaultStyledDocument$ElementBuffer * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractDocument)))) buffer;
+private:
+  ::javax::swing::text::DefaultStyledDocument$StyleChangeListener * styleChangeListener;
+public: // actually package-private
+  static jboolean $assertionsDisabled;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultStyledDocument__
diff --git a/libjava/javax/swing/text/DefaultTextUI.h b/libjava/javax/swing/text/DefaultTextUI.h
new file mode 100644
index 000000000..5c211d304
--- /dev/null
+++ b/libjava/javax/swing/text/DefaultTextUI.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DefaultTextUI__
+#define __javax_swing_text_DefaultTextUI__
+
+#pragma interface
+
+#include <javax/swing/plaf/basic/BasicTextUI.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class DefaultTextUI;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DefaultTextUI : public ::javax::swing::plaf::basic::BasicTextUI
+{
+
+public:
+  DefaultTextUI();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DefaultTextUI__
diff --git a/libjava/javax/swing/text/Document.h b/libjava/javax/swing/text/Document.h
new file mode 100644
index 000000000..d68e3e77d
--- /dev/null
+++ b/libjava/javax/swing/text/Document.h
@@ -0,0 +1,61 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_Document__
+#define __javax_swing_text_Document__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class DocumentListener;
+          class UndoableEditListener;
+      }
+      namespace text
+      {
+          class AttributeSet;
+          class Document;
+          class Element;
+          class Position;
+          class Segment;
+      }
+    }
+  }
+}
+
+class javax::swing::text::Document : public ::java::lang::Object
+{
+
+public:
+  virtual void addDocumentListener(::javax::swing::event::DocumentListener *) = 0;
+  virtual void addUndoableEditListener(::javax::swing::event::UndoableEditListener *) = 0;
+  virtual ::javax::swing::text::Position * createPosition(jint) = 0;
+  virtual ::javax::swing::text::Element * getDefaultRootElement() = 0;
+  virtual ::javax::swing::text::Position * getEndPosition() = 0;
+  virtual jint getLength() = 0;
+  virtual ::java::lang::Object * getProperty(::java::lang::Object *) = 0;
+  virtual JArray< ::javax::swing::text::Element * > * getRootElements() = 0;
+  virtual ::javax::swing::text::Position * getStartPosition() = 0;
+  virtual ::java::lang::String * getText(jint, jint) = 0;
+  virtual void getText(jint, jint, ::javax::swing::text::Segment *) = 0;
+  virtual void insertString(jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *) = 0;
+  virtual void putProperty(::java::lang::Object *, ::java::lang::Object *) = 0;
+  virtual void remove(jint, jint) = 0;
+  virtual void removeDocumentListener(::javax::swing::event::DocumentListener *) = 0;
+  virtual void removeUndoableEditListener(::javax::swing::event::UndoableEditListener *) = 0;
+  virtual void render(::java::lang::Runnable *) = 0;
+  static ::java::lang::String * StreamDescriptionProperty;
+  static ::java::lang::String * TitleProperty;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_text_Document__
diff --git a/libjava/javax/swing/text/DocumentFilter$FilterBypass.h b/libjava/javax/swing/text/DocumentFilter$FilterBypass.h
new file mode 100644
index 000000000..4b5c3589d
--- /dev/null
+++ b/libjava/javax/swing/text/DocumentFilter$FilterBypass.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DocumentFilter$FilterBypass__
+#define __javax_swing_text_DocumentFilter$FilterBypass__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AttributeSet;
+          class Document;
+          class DocumentFilter$FilterBypass;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DocumentFilter$FilterBypass : public ::java::lang::Object
+{
+
+public:
+  DocumentFilter$FilterBypass();
+  virtual ::javax::swing::text::Document * getDocument() = 0;
+  virtual void insertString(jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *) = 0;
+  virtual void remove(jint, jint) = 0;
+  virtual void replace(jint, jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *) = 0;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DocumentFilter$FilterBypass__
diff --git a/libjava/javax/swing/text/DocumentFilter.h b/libjava/javax/swing/text/DocumentFilter.h
new file mode 100644
index 000000000..106478aff
--- /dev/null
+++ b/libjava/javax/swing/text/DocumentFilter.h
@@ -0,0 +1,37 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_DocumentFilter__
+#define __javax_swing_text_DocumentFilter__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AttributeSet;
+          class DocumentFilter;
+          class DocumentFilter$FilterBypass;
+      }
+    }
+  }
+}
+
+class javax::swing::text::DocumentFilter : public ::java::lang::Object
+{
+
+public:
+  DocumentFilter();
+  virtual void insertString(::javax::swing::text::DocumentFilter$FilterBypass *, jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *);
+  virtual void remove(::javax::swing::text::DocumentFilter$FilterBypass *, jint, jint);
+  virtual void replace(::javax::swing::text::DocumentFilter$FilterBypass *, jint, jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_DocumentFilter__
diff --git a/libjava/javax/swing/text/EditorKit.h b/libjava/javax/swing/text/EditorKit.h
new file mode 100644
index 000000000..eaeef5042
--- /dev/null
+++ b/libjava/javax/swing/text/EditorKit.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_EditorKit__
+#define __javax_swing_text_EditorKit__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class Action;
+        class JEditorPane;
+      namespace text
+      {
+          class Caret;
+          class Document;
+          class EditorKit;
+          class ViewFactory;
+      }
+    }
+  }
+}
+
+class javax::swing::text::EditorKit : public ::java::lang::Object
+{
+
+public:
+  EditorKit();
+  virtual ::java::lang::Object * clone();
+  virtual void deinstall(::javax::swing::JEditorPane *);
+  virtual void install(::javax::swing::JEditorPane *);
+  virtual ::javax::swing::text::Caret * createCaret() = 0;
+  virtual ::javax::swing::text::Document * createDefaultDocument() = 0;
+  virtual JArray< ::javax::swing::Action * > * getActions() = 0;
+  virtual ::java::lang::String * getContentType() = 0;
+  virtual ::javax::swing::text::ViewFactory * getViewFactory() = 0;
+  virtual void read(::java::io::InputStream *, ::javax::swing::text::Document *, jint) = 0;
+  virtual void read(::java::io::Reader *, ::javax::swing::text::Document *, jint) = 0;
+  virtual void write(::java::io::OutputStream *, ::javax::swing::text::Document *, jint, jint) = 0;
+  virtual void write(::java::io::Writer *, ::javax::swing::text::Document *, jint, jint) = 0;
+private:
+  static const jlong serialVersionUID = -5044124649345887822LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_EditorKit__
diff --git a/libjava/javax/swing/text/Element.h b/libjava/javax/swing/text/Element.h
new file mode 100644
index 000000000..6166044c0
--- /dev/null
+++ b/libjava/javax/swing/text/Element.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_Element__
+#define __javax_swing_text_Element__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AttributeSet;
+          class Document;
+          class Element;
+      }
+    }
+  }
+}
+
+class javax::swing::text::Element : public ::java::lang::Object
+{
+
+public:
+  virtual ::javax::swing::text::AttributeSet * getAttributes() = 0;
+  virtual ::javax::swing::text::Document * getDocument() = 0;
+  virtual ::javax::swing::text::Element * getElement(jint) = 0;
+  virtual jint getElementCount() = 0;
+  virtual jint getElementIndex(jint) = 0;
+  virtual jint getEndOffset() = 0;
+  virtual ::java::lang::String * getName() = 0;
+  virtual ::javax::swing::text::Element * getParentElement() = 0;
+  virtual jint getStartOffset() = 0;
+  virtual jboolean isLeaf() = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_text_Element__
diff --git a/libjava/javax/swing/text/ElementIterator$ElementRef.h b/libjava/javax/swing/text/ElementIterator$ElementRef.h
new file mode 100644
index 000000000..dd2c984c4
--- /dev/null
+++ b/libjava/javax/swing/text/ElementIterator$ElementRef.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_ElementIterator$ElementRef__
+#define __javax_swing_text_ElementIterator$ElementRef__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Element;
+          class ElementIterator;
+          class ElementIterator$ElementRef;
+      }
+    }
+  }
+}
+
+class javax::swing::text::ElementIterator$ElementRef : public ::java::lang::Object
+{
+
+public: // actually package-private
+  ElementIterator$ElementRef(::javax::swing::text::ElementIterator *, ::javax::swing::text::Element *);
+  ::javax::swing::text::Element * __attribute__((aligned(__alignof__( ::java::lang::Object)))) element;
+  jint index;
+  ::javax::swing::text::ElementIterator * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_ElementIterator$ElementRef__
diff --git a/libjava/javax/swing/text/ElementIterator.h b/libjava/javax/swing/text/ElementIterator.h
new file mode 100644
index 000000000..1d9636021
--- /dev/null
+++ b/libjava/javax/swing/text/ElementIterator.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_ElementIterator__
+#define __javax_swing_text_ElementIterator__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Document;
+          class Element;
+          class ElementIterator;
+      }
+    }
+  }
+}
+
+class javax::swing::text::ElementIterator : public ::java::lang::Object
+{
+
+public:
+  ElementIterator(::javax::swing::text::Document *);
+  ElementIterator(::javax::swing::text::Element *);
+  virtual ::java::lang::Object * clone();
+  virtual ::javax::swing::text::Element * current();
+  virtual jint depth();
+  virtual ::javax::swing::text::Element * first();
+  virtual ::javax::swing::text::Element * next();
+  virtual ::javax::swing::text::Element * previous();
+private:
+  ::javax::swing::text::Element * deepestLeaf(::javax::swing::text::Element *);
+  ::javax::swing::text::Element * __attribute__((aligned(__alignof__( ::java::lang::Object)))) root;
+  ::java::util::Stack * stack;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_ElementIterator__
diff --git a/libjava/javax/swing/text/EmptyAttributeSet$1.h b/libjava/javax/swing/text/EmptyAttributeSet$1.h
new file mode 100644
index 000000000..4d63472d6
--- /dev/null
+++ b/libjava/javax/swing/text/EmptyAttributeSet$1.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_EmptyAttributeSet$1__
+#define __javax_swing_text_EmptyAttributeSet$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class EmptyAttributeSet;
+          class EmptyAttributeSet$1;
+      }
+    }
+  }
+}
+
+class javax::swing::text::EmptyAttributeSet$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  EmptyAttributeSet$1(::javax::swing::text::EmptyAttributeSet *);
+public:
+  virtual jboolean hasMoreElements();
+  virtual ::java::lang::Object * nextElement();
+public: // actually package-private
+  ::javax::swing::text::EmptyAttributeSet * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_EmptyAttributeSet$1__
diff --git a/libjava/javax/swing/text/EmptyAttributeSet.h b/libjava/javax/swing/text/EmptyAttributeSet.h
new file mode 100644
index 000000000..e0f192944
--- /dev/null
+++ b/libjava/javax/swing/text/EmptyAttributeSet.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_EmptyAttributeSet__
+#define __javax_swing_text_EmptyAttributeSet__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AttributeSet;
+          class EmptyAttributeSet;
+      }
+    }
+  }
+}
+
+class javax::swing::text::EmptyAttributeSet : public ::java::lang::Object
+{
+
+public: // actually package-private
+  EmptyAttributeSet();
+public:
+  jboolean containsAttribute(::java::lang::Object *, ::java::lang::Object *);
+  jboolean containsAttributes(::javax::swing::text::AttributeSet *);
+  ::javax::swing::text::AttributeSet * copyAttributes();
+  ::java::lang::Object * getAttribute(::java::lang::Object *);
+  jint getAttributeCount();
+  ::java::util::Enumeration * getAttributeNames();
+  ::javax::swing::text::AttributeSet * getResolveParent();
+  jboolean isDefined(::java::lang::Object *);
+  jboolean isEqual(::javax::swing::text::AttributeSet *);
+  jboolean equals(::java::lang::Object *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_EmptyAttributeSet__
diff --git a/libjava/javax/swing/text/FieldView$1.h b/libjava/javax/swing/text/FieldView$1.h
new file mode 100644
index 000000000..2979db8ae
--- /dev/null
+++ b/libjava/javax/swing/text/FieldView$1.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_FieldView$1__
+#define __javax_swing_text_FieldView$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ChangeEvent;
+      }
+      namespace text
+      {
+          class FieldView;
+          class FieldView$1;
+      }
+    }
+  }
+}
+
+class javax::swing::text::FieldView$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  FieldView$1(::javax::swing::text::FieldView *);
+public:
+  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
+public: // actually package-private
+  ::javax::swing::text::FieldView * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_FieldView$1__
diff --git a/libjava/javax/swing/text/FieldView.h b/libjava/javax/swing/text/FieldView.h
new file mode 100644
index 000000000..54cf4fb82
--- /dev/null
+++ b/libjava/javax/swing/text/FieldView.h
@@ -0,0 +1,73 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_FieldView__
+#define __javax_swing_text_FieldView__
+
+#pragma interface
+
+#include <javax/swing/text/PlainView.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class FontMetrics;
+        class Graphics;
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class BoundedRangeModel;
+      namespace event
+      {
+          class DocumentEvent;
+      }
+      namespace text
+      {
+          class Element;
+          class FieldView;
+          class Position$Bias;
+          class ViewFactory;
+      }
+    }
+  }
+}
+
+class javax::swing::text::FieldView : public ::javax::swing::text::PlainView
+{
+
+public:
+  FieldView(::javax::swing::text::Element *);
+private:
+  void checkContainer();
+  void updateVisibility();
+public: // actually protected
+  virtual ::java::awt::FontMetrics * getFontMetrics();
+  virtual ::java::awt::Shape * adjustAllocation(::java::awt::Shape *);
+public:
+  virtual jfloat getPreferredSpan(jint);
+private:
+  jfloat calculateHorizontalSpan();
+public:
+  virtual jint getResizeWeight(jint);
+  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
+  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
+  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
+public: // actually package-private
+  ::javax::swing::BoundedRangeModel * __attribute__((aligned(__alignof__( ::javax::swing::text::PlainView)))) horizontalVisibility;
+  jfloat cachedSpan;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_FieldView__
diff --git a/libjava/javax/swing/text/FlowView$FlowStrategy.h b/libjava/javax/swing/text/FlowView$FlowStrategy.h
new file mode 100644
index 000000000..c9d567d2f
--- /dev/null
+++ b/libjava/javax/swing/text/FlowView$FlowStrategy.h
@@ -0,0 +1,62 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_FlowView$FlowStrategy__
+#define __javax_swing_text_FlowView$FlowStrategy__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class DocumentEvent;
+      }
+      namespace text
+      {
+          class FlowView;
+          class FlowView$FlowStrategy;
+          class View;
+      }
+    }
+  }
+}
+
+class javax::swing::text::FlowView$FlowStrategy : public ::java::lang::Object
+{
+
+public:
+  FlowView$FlowStrategy();
+  virtual void insertUpdate(::javax::swing::text::FlowView *, ::javax::swing::event::DocumentEvent *, ::java::awt::Rectangle *);
+  virtual void removeUpdate(::javax::swing::text::FlowView *, ::javax::swing::event::DocumentEvent *, ::java::awt::Rectangle *);
+  virtual void changedUpdate(::javax::swing::text::FlowView *, ::javax::swing::event::DocumentEvent *, ::java::awt::Rectangle *);
+public: // actually protected
+  virtual ::javax::swing::text::View * getLogicalView(::javax::swing::text::FlowView *);
+public:
+  virtual void layout(::javax::swing::text::FlowView *);
+public: // actually protected
+  virtual jint layoutRow(::javax::swing::text::FlowView *, jint, jint);
+  virtual ::javax::swing::text::View * createView(::javax::swing::text::FlowView *, jint, jint, jint);
+  virtual void adjustRow(::javax::swing::text::FlowView *, jint, jint, jint);
+private:
+  jboolean contains(::javax::swing::text::View *, ::javax::swing::text::View *);
+  void reparent(::javax::swing::text::View *, ::javax::swing::text::View *);
+public: // actually package-private
+  static jboolean $assertionsDisabled;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_FlowView$FlowStrategy__
diff --git a/libjava/javax/swing/text/FlowView$LogicalView.h b/libjava/javax/swing/text/FlowView$LogicalView.h
new file mode 100644
index 000000000..271b4ef4a
--- /dev/null
+++ b/libjava/javax/swing/text/FlowView$LogicalView.h
@@ -0,0 +1,68 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_FlowView$LogicalView__
+#define __javax_swing_text_FlowView$LogicalView__
+
+#pragma interface
+
+#include <javax/swing/text/CompositeView.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+        class Rectangle;
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class DocumentEvent;
+      }
+      namespace text
+      {
+          class AttributeSet;
+          class Element;
+          class FlowView;
+          class FlowView$LogicalView;
+          class View;
+          class ViewFactory;
+      }
+    }
+  }
+}
+
+class javax::swing::text::FlowView$LogicalView : public ::javax::swing::text::CompositeView
+{
+
+public: // actually package-private
+  FlowView$LogicalView(::javax::swing::text::FlowView *, ::javax::swing::text::Element *);
+public:
+  virtual ::javax::swing::text::AttributeSet * getAttributes();
+public: // actually protected
+  virtual void childAllocation(jint, ::java::awt::Rectangle *);
+  virtual ::javax::swing::text::View * getViewAtPoint(jint, jint, ::java::awt::Rectangle *);
+  virtual jboolean isAfter(jint, jint, ::java::awt::Rectangle *);
+  virtual jboolean isBefore(jint, jint, ::java::awt::Rectangle *);
+public:
+  virtual jfloat getPreferredSpan(jint);
+  virtual jfloat getMinimumSpan(jint);
+  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
+public: // actually protected
+  virtual void loadChildren(::javax::swing::text::ViewFactory *);
+  virtual void forwardUpdateToView(::javax::swing::text::View *, ::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual jint getViewIndexAtPosition(jint);
+public: // actually package-private
+  ::javax::swing::text::FlowView * __attribute__((aligned(__alignof__( ::javax::swing::text::CompositeView)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_FlowView$LogicalView__
diff --git a/libjava/javax/swing/text/FlowView.h b/libjava/javax/swing/text/FlowView.h
new file mode 100644
index 000000000..765357915
--- /dev/null
+++ b/libjava/javax/swing/text/FlowView.h
@@ -0,0 +1,69 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_FlowView__
+#define __javax_swing_text_FlowView__
+
+#pragma interface
+
+#include <javax/swing/text/BoxView.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class SizeRequirements;
+      namespace event
+      {
+          class DocumentEvent;
+      }
+      namespace text
+      {
+          class Element;
+          class FlowView;
+          class FlowView$FlowStrategy;
+          class View;
+          class ViewFactory;
+      }
+    }
+  }
+}
+
+class javax::swing::text::FlowView : public ::javax::swing::text::BoxView
+{
+
+public:
+  FlowView(::javax::swing::text::Element *, jint);
+  virtual jint getFlowAxis();
+  virtual jint getFlowSpan(jint);
+  virtual jint getFlowStart(jint);
+public: // actually protected
+  virtual ::javax::swing::text::View * createRow() = 0;
+  virtual void loadChildren(::javax::swing::text::ViewFactory *);
+  virtual void layout(jint, jint);
+public:
+  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+public: // actually protected
+  virtual jint getViewIndexAtPosition(jint);
+  virtual ::javax::swing::SizeRequirements * calculateMinorAxisRequirements(jint, ::javax::swing::SizeRequirements *);
+public: // actually package-private
+  static ::javax::swing::text::FlowView$FlowStrategy * sharedStrategy;
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::javax::swing::text::BoxView)))) layoutSpan;
+  ::javax::swing::text::View * layoutPool;
+  ::javax::swing::text::FlowView$FlowStrategy * strategy;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_FlowView__
diff --git a/libjava/javax/swing/text/GapContent$GapContentPosition.h b/libjava/javax/swing/text/GapContent$GapContentPosition.h
new file mode 100644
index 000000000..a1d7afa66
--- /dev/null
+++ b/libjava/javax/swing/text/GapContent$GapContentPosition.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_GapContent$GapContentPosition__
+#define __javax_swing_text_GapContent$GapContentPosition__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class GapContent;
+          class GapContent$GapContentPosition;
+          class GapContent$Mark;
+      }
+    }
+  }
+}
+
+class javax::swing::text::GapContent$GapContentPosition : public ::java::lang::Object
+{
+
+public: // actually package-private
+  GapContent$GapContentPosition(::javax::swing::text::GapContent *);
+public:
+  virtual jint getOffset();
+public: // actually package-private
+  ::javax::swing::text::GapContent$Mark * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mark;
+  ::javax::swing::text::GapContent * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_GapContent$GapContentPosition__
diff --git a/libjava/javax/swing/text/GapContent$InsertUndo.h b/libjava/javax/swing/text/GapContent$InsertUndo.h
new file mode 100644
index 000000000..f36085d3c
--- /dev/null
+++ b/libjava/javax/swing/text/GapContent$InsertUndo.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_GapContent$InsertUndo__
+#define __javax_swing_text_GapContent$InsertUndo__
+
+#pragma interface
+
+#include <javax/swing/undo/AbstractUndoableEdit.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class GapContent;
+          class GapContent$InsertUndo;
+      }
+    }
+  }
+}
+
+class javax::swing::text::GapContent$InsertUndo : public ::javax::swing::undo::AbstractUndoableEdit
+{
+
+public:
+  GapContent$InsertUndo(::javax::swing::text::GapContent *, jint, jint);
+  virtual void undo();
+  virtual void redo();
+  jint __attribute__((aligned(__alignof__( ::javax::swing::undo::AbstractUndoableEdit)))) where;
+  jint length;
+public: // actually package-private
+  ::java::lang::String * text;
+private:
+  ::java::util::Vector * positions;
+public: // actually package-private
+  ::javax::swing::text::GapContent * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_GapContent$InsertUndo__
diff --git a/libjava/javax/swing/text/GapContent$Mark.h b/libjava/javax/swing/text/GapContent$Mark.h
new file mode 100644
index 000000000..356710233
--- /dev/null
+++ b/libjava/javax/swing/text/GapContent$Mark.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_GapContent$Mark__
+#define __javax_swing_text_GapContent$Mark__
+
+#pragma interface
+
+#include <java/lang/ref/WeakReference.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class GapContent;
+          class GapContent$GapContentPosition;
+          class GapContent$Mark;
+      }
+    }
+  }
+}
+
+class javax::swing::text::GapContent$Mark : public ::java::lang::ref::WeakReference
+{
+
+public: // actually package-private
+  GapContent$Mark(::javax::swing::text::GapContent *, jint);
+  GapContent$Mark(::javax::swing::text::GapContent *, jint, ::javax::swing::text::GapContent$GapContentPosition *, ::java::lang::ref::ReferenceQueue *);
+  virtual jint getOffset();
+  virtual ::javax::swing::text::GapContent$GapContentPosition * getPosition();
+  jint __attribute__((aligned(__alignof__( ::java::lang::ref::WeakReference)))) mark;
+  ::javax::swing::text::GapContent * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_GapContent$Mark__
diff --git a/libjava/javax/swing/text/GapContent$UndoPosRef.h b/libjava/javax/swing/text/GapContent$UndoPosRef.h
new file mode 100644
index 000000000..bd0629ac8
--- /dev/null
+++ b/libjava/javax/swing/text/GapContent$UndoPosRef.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_GapContent$UndoPosRef__
+#define __javax_swing_text_GapContent$UndoPosRef__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class GapContent;
+          class GapContent$Mark;
+          class GapContent$UndoPosRef;
+      }
+    }
+  }
+}
+
+class javax::swing::text::GapContent$UndoPosRef : public ::java::lang::Object
+{
+
+public: // actually package-private
+  GapContent$UndoPosRef(::javax::swing::text::GapContent *, ::javax::swing::text::GapContent$Mark *);
+  virtual void reset();
+private:
+  ::javax::swing::text::GapContent$Mark * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mark;
+  jint undoOffset;
+public: // actually package-private
+  ::javax::swing::text::GapContent * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_GapContent$UndoPosRef__
diff --git a/libjava/javax/swing/text/GapContent$UndoRemove.h b/libjava/javax/swing/text/GapContent$UndoRemove.h
new file mode 100644
index 000000000..f5f8d6ae4
--- /dev/null
+++ b/libjava/javax/swing/text/GapContent$UndoRemove.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_GapContent$UndoRemove__
+#define __javax_swing_text_GapContent$UndoRemove__
+
+#pragma interface
+
+#include <javax/swing/undo/AbstractUndoableEdit.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class GapContent;
+          class GapContent$UndoRemove;
+      }
+    }
+  }
+}
+
+class javax::swing::text::GapContent$UndoRemove : public ::javax::swing::undo::AbstractUndoableEdit
+{
+
+public:
+  GapContent$UndoRemove(::javax::swing::text::GapContent *, jint, ::java::lang::String *);
+  virtual void undo();
+  virtual void redo();
+  jint __attribute__((aligned(__alignof__( ::javax::swing::undo::AbstractUndoableEdit)))) where;
+public: // actually package-private
+  ::java::lang::String * text;
+private:
+  ::java::util::Vector * positions;
+public: // actually package-private
+  ::javax::swing::text::GapContent * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_GapContent$UndoRemove__
diff --git a/libjava/javax/swing/text/GapContent.h b/libjava/javax/swing/text/GapContent.h
new file mode 100644
index 000000000..44a26ef53
--- /dev/null
+++ b/libjava/javax/swing/text/GapContent.h
@@ -0,0 +1,91 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_GapContent__
+#define __javax_swing_text_GapContent__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class GapContent;
+          class GapContent$Mark;
+          class Position;
+          class Segment;
+      }
+      namespace undo
+      {
+          class UndoableEdit;
+      }
+    }
+  }
+}
+
+class javax::swing::text::GapContent : public ::java::lang::Object
+{
+
+public:
+  GapContent();
+  GapContent(jint);
+public: // actually protected
+  virtual ::java::lang::Object * allocateArray(jint);
+  virtual jint getArrayLength();
+public:
+  virtual jint length();
+  virtual ::javax::swing::undo::UndoableEdit * insertString(jint, ::java::lang::String *);
+  virtual ::javax::swing::undo::UndoableEdit * remove(jint, jint);
+  virtual ::java::lang::String * getString(jint, jint);
+  virtual void getChars(jint, jint, ::javax::swing::text::Segment *);
+  virtual ::javax::swing::text::Position * createPosition(jint);
+public: // actually protected
+  virtual void shiftEnd(jint);
+  virtual void shiftGap(jint);
+  virtual void shiftGapStartDown(jint);
+  virtual void shiftGapEndUp(jint);
+  virtual ::java::lang::Object * getArray();
+  virtual void replace(jint, jint, ::java::lang::Object *, jint);
+private:
+  void removeImpl(jint, jint);
+  jint addImpl(jint, jint);
+public: // actually protected
+  virtual jint getGapStart();
+  virtual jint getGapEnd();
+  virtual ::java::util::Vector * getPositionsInRange(::java::util::Vector *, jint, jint);
+  virtual void resetMarksAtZero();
+  virtual void updateUndoPositions(::java::util::Vector *, jint, jint);
+private:
+  void dump();
+  void dumpMarks();
+public: // actually package-private
+  virtual jint search(::javax::swing::text::GapContent$Mark *);
+private:
+  jint searchFirst(jint);
+  jint compare(::javax::swing::text::GapContent$Mark *, ::javax::swing::text::GapContent$Mark *);
+  void garbageCollect();
+  static const jlong serialVersionUID = -6226052713477823730LL;
+public: // actually package-private
+  static const jint DEFAULT_BUFSIZE = 10;
+  JArray< jchar > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer;
+  jint gapStart;
+  jint gapEnd;
+  ::java::util::ArrayList * marks;
+private:
+  jint garbageMarks;
+  ::javax::swing::text::GapContent$Mark * searchMark;
+public: // actually package-private
+  ::java::lang::ref::ReferenceQueue * queueOfDeath;
+  static jboolean $assertionsDisabled;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_GapContent__
diff --git a/libjava/javax/swing/text/GlyphView$DefaultGlyphPainter.h b/libjava/javax/swing/text/GlyphView$DefaultGlyphPainter.h
new file mode 100644
index 000000000..7a9c8a6b7
--- /dev/null
+++ b/libjava/javax/swing/text/GlyphView$DefaultGlyphPainter.h
@@ -0,0 +1,60 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_GlyphView$DefaultGlyphPainter__
+#define __javax_swing_text_GlyphView$DefaultGlyphPainter__
+
+#pragma interface
+
+#include <javax/swing/text/GlyphView$GlyphPainter.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class FontMetrics;
+        class Graphics;
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class GlyphView;
+          class GlyphView$DefaultGlyphPainter;
+          class Position$Bias;
+          class TabExpander;
+      }
+    }
+  }
+}
+
+class javax::swing::text::GlyphView$DefaultGlyphPainter : public ::javax::swing::text::GlyphView$GlyphPainter
+{
+
+public: // actually package-private
+  GlyphView$DefaultGlyphPainter();
+public:
+  virtual jfloat getHeight(::javax::swing::text::GlyphView *);
+  virtual void paint(::javax::swing::text::GlyphView *, ::java::awt::Graphics *, ::java::awt::Shape *, jint, jint);
+  virtual ::java::awt::Shape * modelToView(::javax::swing::text::GlyphView *, jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *);
+  virtual jfloat getSpan(::javax::swing::text::GlyphView *, jint, jint, ::javax::swing::text::TabExpander *, jfloat);
+  virtual jfloat getAscent(::javax::swing::text::GlyphView *);
+  virtual jfloat getDescent(::javax::swing::text::GlyphView *);
+  virtual jint getBoundedPosition(::javax::swing::text::GlyphView *, jint, jfloat, jfloat);
+  virtual jint viewToModel(::javax::swing::text::GlyphView *, jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
+private:
+  void updateFontMetrics(::javax::swing::text::GlyphView *);
+public: // actually package-private
+  ::java::awt::FontMetrics * __attribute__((aligned(__alignof__( ::javax::swing::text::GlyphView$GlyphPainter)))) fontMetrics;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_GlyphView$DefaultGlyphPainter__
diff --git a/libjava/javax/swing/text/GlyphView$GlyphPainter.h b/libjava/javax/swing/text/GlyphView$GlyphPainter.h
new file mode 100644
index 000000000..ada0b57bf
--- /dev/null
+++ b/libjava/javax/swing/text/GlyphView$GlyphPainter.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_GlyphView$GlyphPainter__
+#define __javax_swing_text_GlyphView$GlyphPainter__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class GlyphView;
+          class GlyphView$GlyphPainter;
+          class Position$Bias;
+          class TabExpander;
+      }
+    }
+  }
+}
+
+class javax::swing::text::GlyphView$GlyphPainter : public ::java::lang::Object
+{
+
+public:
+  GlyphView$GlyphPainter();
+  virtual jfloat getAscent(::javax::swing::text::GlyphView *) = 0;
+  virtual jfloat getDescent(::javax::swing::text::GlyphView *) = 0;
+  virtual jfloat getHeight(::javax::swing::text::GlyphView *) = 0;
+  virtual jint getBoundedPosition(::javax::swing::text::GlyphView *, jint, jfloat, jfloat) = 0;
+  virtual void paint(::javax::swing::text::GlyphView *, ::java::awt::Graphics *, ::java::awt::Shape *, jint, jint) = 0;
+  virtual ::java::awt::Shape * modelToView(::javax::swing::text::GlyphView *, jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *) = 0;
+  virtual jint viewToModel(::javax::swing::text::GlyphView *, jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *) = 0;
+  virtual jfloat getSpan(::javax::swing::text::GlyphView *, jint, jint, ::javax::swing::text::TabExpander *, jfloat) = 0;
+  virtual jint getNextVisualPositionFrom(::javax::swing::text::GlyphView *, jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
+  virtual ::javax::swing::text::GlyphView$GlyphPainter * getPainter(::javax::swing::text::GlyphView *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_GlyphView$GlyphPainter__
diff --git a/libjava/javax/swing/text/GlyphView$J2DGlyphPainter.h b/libjava/javax/swing/text/GlyphView$J2DGlyphPainter.h
new file mode 100644
index 000000000..a93512ae5
--- /dev/null
+++ b/libjava/javax/swing/text/GlyphView$J2DGlyphPainter.h
@@ -0,0 +1,65 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_GlyphView$J2DGlyphPainter__
+#define __javax_swing_text_GlyphView$J2DGlyphPainter__
+
+#pragma interface
+
+#include <javax/swing/text/GlyphView$GlyphPainter.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Font;
+        class Graphics;
+        class Shape;
+      namespace font
+      {
+          class FontRenderContext;
+          class TextLayout;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class GlyphView;
+          class GlyphView$GlyphPainter;
+          class GlyphView$J2DGlyphPainter;
+          class Position$Bias;
+          class TabExpander;
+      }
+    }
+  }
+}
+
+class javax::swing::text::GlyphView$J2DGlyphPainter : public ::javax::swing::text::GlyphView$GlyphPainter
+{
+
+public: // actually package-private
+  GlyphView$J2DGlyphPainter(::java::lang::String *, ::java::awt::Font *, ::java::awt::font::FontRenderContext *);
+public:
+  virtual ::javax::swing::text::GlyphView$GlyphPainter * getPainter(::javax::swing::text::GlyphView *, jint, jint);
+  virtual jfloat getAscent(::javax::swing::text::GlyphView *);
+  virtual jint getBoundedPosition(::javax::swing::text::GlyphView *, jint, jfloat, jfloat);
+  virtual jfloat getDescent(::javax::swing::text::GlyphView *);
+  virtual jfloat getHeight(::javax::swing::text::GlyphView *);
+  virtual jfloat getSpan(::javax::swing::text::GlyphView *, jint, jint, ::javax::swing::text::TabExpander *, jfloat);
+  virtual ::java::awt::Shape * modelToView(::javax::swing::text::GlyphView *, jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *);
+  virtual void paint(::javax::swing::text::GlyphView *, ::java::awt::Graphics *, ::java::awt::Shape *, jint, jint);
+  virtual jint viewToModel(::javax::swing::text::GlyphView *, jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
+public: // actually package-private
+  ::java::awt::font::TextLayout * __attribute__((aligned(__alignof__( ::javax::swing::text::GlyphView$GlyphPainter)))) textLayout;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_GlyphView$J2DGlyphPainter__
diff --git a/libjava/javax/swing/text/GlyphView.h b/libjava/javax/swing/text/GlyphView.h
new file mode 100644
index 000000000..e63c5077e
--- /dev/null
+++ b/libjava/javax/swing/text/GlyphView.h
@@ -0,0 +1,100 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_GlyphView__
+#define __javax_swing_text_GlyphView__
+
+#pragma interface
+
+#include <javax/swing/text/View.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Font;
+        class Graphics;
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class DocumentEvent;
+      }
+      namespace text
+      {
+          class Element;
+          class GlyphView;
+          class GlyphView$GlyphPainter;
+          class Position$Bias;
+          class Segment;
+          class TabExpander;
+          class View;
+          class ViewFactory;
+      }
+    }
+  }
+}
+
+class javax::swing::text::GlyphView : public ::javax::swing::text::View
+{
+
+public:
+  GlyphView(::javax::swing::text::Element *);
+  virtual ::javax::swing::text::GlyphView$GlyphPainter * getGlyphPainter();
+  virtual void setGlyphPainter(::javax::swing::text::GlyphView$GlyphPainter *);
+public: // actually protected
+  virtual void checkPainter();
+public:
+  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
+  virtual jfloat getPreferredSpan(jint);
+  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
+  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
+  virtual ::javax::swing::text::TabExpander * getTabExpander();
+  virtual jfloat getTabbedSpan(jfloat, ::javax::swing::text::TabExpander *);
+  virtual jfloat getPartialSpan(jint, jint);
+  virtual jint getStartOffset();
+  virtual jint getEndOffset();
+  virtual ::javax::swing::text::Segment * getText(jint, jint);
+  virtual ::java::awt::Font * getFont();
+  virtual ::java::awt::Color * getForeground();
+  virtual ::java::awt::Color * getBackground();
+  virtual jboolean isStrikeThrough();
+  virtual jboolean isSubscript();
+  virtual jboolean isSuperscript();
+  virtual jboolean isUnderline();
+public: // actually protected
+  virtual ::java::lang::Object * clone();
+public:
+  virtual ::javax::swing::text::View * breakView(jint, jint, jfloat, jfloat);
+  virtual jint getBreakWeight(jint, jfloat, jfloat);
+private:
+  jint getBreakLocation(jint, jint);
+public:
+  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual ::javax::swing::text::View * createFragment(jint, jint);
+  virtual jfloat getAlignment(jint);
+  virtual jint getNextVisualPositionFrom(jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
+public: // actually package-private
+  ::javax::swing::text::GlyphView$GlyphPainter * __attribute__((aligned(__alignof__( ::javax::swing::text::View)))) glyphPainter;
+private:
+  jint offset;
+  jint length;
+  jfloat tabX;
+  ::javax::swing::text::TabExpander * tabExpander;
+  ::javax::swing::text::Segment * cached;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_GlyphView__
diff --git a/libjava/javax/swing/text/Highlighter$Highlight.h b/libjava/javax/swing/text/Highlighter$Highlight.h
new file mode 100644
index 000000000..92ae0f430
--- /dev/null
+++ b/libjava/javax/swing/text/Highlighter$Highlight.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_Highlighter$Highlight__
+#define __javax_swing_text_Highlighter$Highlight__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Highlighter$Highlight;
+          class Highlighter$HighlightPainter;
+      }
+    }
+  }
+}
+
+class javax::swing::text::Highlighter$Highlight : public ::java::lang::Object
+{
+
+public:
+  virtual jint getEndOffset() = 0;
+  virtual jint getStartOffset() = 0;
+  virtual ::javax::swing::text::Highlighter$HighlightPainter * getPainter() = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_text_Highlighter$Highlight__
diff --git a/libjava/javax/swing/text/Highlighter$HighlightPainter.h b/libjava/javax/swing/text/Highlighter$HighlightPainter.h
new file mode 100644
index 000000000..8a0987579
--- /dev/null
+++ b/libjava/javax/swing/text/Highlighter$HighlightPainter.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_Highlighter$HighlightPainter__
+#define __javax_swing_text_Highlighter$HighlightPainter__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Highlighter$HighlightPainter;
+          class JTextComponent;
+      }
+    }
+  }
+}
+
+class javax::swing::text::Highlighter$HighlightPainter : public ::java::lang::Object
+{
+
+public:
+  virtual void paint(::java::awt::Graphics *, jint, jint, ::java::awt::Shape *, ::javax::swing::text::JTextComponent *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_text_Highlighter$HighlightPainter__
diff --git a/libjava/javax/swing/text/Highlighter.h b/libjava/javax/swing/text/Highlighter.h
new file mode 100644
index 000000000..2f947d226
--- /dev/null
+++ b/libjava/javax/swing/text/Highlighter.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_Highlighter__
+#define __javax_swing_text_Highlighter__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Highlighter;
+          class Highlighter$Highlight;
+          class Highlighter$HighlightPainter;
+          class JTextComponent;
+      }
+    }
+  }
+}
+
+class javax::swing::text::Highlighter : public ::java::lang::Object
+{
+
+public:
+  virtual void install(::javax::swing::text::JTextComponent *) = 0;
+  virtual void deinstall(::javax::swing::text::JTextComponent *) = 0;
+  virtual ::java::lang::Object * addHighlight(jint, jint, ::javax::swing::text::Highlighter$HighlightPainter *) = 0;
+  virtual void removeAllHighlights() = 0;
+  virtual void removeHighlight(::java::lang::Object *) = 0;
+  virtual void changeHighlight(::java::lang::Object *, jint, jint) = 0;
+  virtual JArray< ::javax::swing::text::Highlighter$Highlight * > * getHighlights() = 0;
+  virtual void paint(::java::awt::Graphics *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_text_Highlighter__
diff --git a/libjava/javax/swing/text/IconView.h b/libjava/javax/swing/text/IconView.h
new file mode 100644
index 000000000..cc47c48a2
--- /dev/null
+++ b/libjava/javax/swing/text/IconView.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_IconView__
+#define __javax_swing_text_IconView__
+
+#pragma interface
+
+#include <javax/swing/text/View.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Element;
+          class IconView;
+          class Position$Bias;
+      }
+    }
+  }
+}
+
+class javax::swing::text::IconView : public ::javax::swing::text::View
+{
+
+public:
+  IconView(::javax::swing::text::Element *);
+  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
+  virtual jfloat getPreferredSpan(jint);
+  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
+  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
+  virtual jfloat getAlignment(jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_IconView__
diff --git a/libjava/javax/swing/text/InternationalFormatter.h b/libjava/javax/swing/text/InternationalFormatter.h
new file mode 100644
index 000000000..e0c44dd44
--- /dev/null
+++ b/libjava/javax/swing/text/InternationalFormatter.h
@@ -0,0 +1,65 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_InternationalFormatter__
+#define __javax_swing_text_InternationalFormatter__
+
+#pragma interface
+
+#include <javax/swing/text/DefaultFormatter.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class Format;
+        class Format$Field;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Action;
+        class JFormattedTextField;
+      namespace text
+      {
+          class InternationalFormatter;
+      }
+    }
+  }
+}
+
+class javax::swing::text::InternationalFormatter : public ::javax::swing::text::DefaultFormatter
+{
+
+public:
+  InternationalFormatter();
+  InternationalFormatter(::java::text::Format *);
+  virtual void setFormat(::java::text::Format *);
+  virtual ::java::text::Format * getFormat();
+  virtual void setMinimum(::java::lang::Comparable *);
+  virtual ::java::lang::Comparable * getMinimum();
+  virtual void setMaximum(::java::lang::Comparable *);
+  virtual ::java::lang::Comparable * getMaximum();
+  virtual void install(::javax::swing::JFormattedTextField *);
+  virtual ::java::lang::String * valueToString(::java::lang::Object *);
+  virtual ::java::lang::Object * stringToValue(::java::lang::String *);
+  virtual JArray< ::java::text::Format$Field * > * getFields(jint);
+  virtual ::java::lang::Object * clone();
+public: // actually protected
+  virtual JArray< ::javax::swing::Action * > * getActions();
+private:
+  static const jlong serialVersionUID = 2436068675711756856LL;
+public: // actually package-private
+  ::java::text::Format * __attribute__((aligned(__alignof__( ::javax::swing::text::DefaultFormatter)))) format;
+  ::java::lang::Comparable * minimum;
+  ::java::lang::Comparable * maximum;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_InternationalFormatter__
diff --git a/libjava/javax/swing/text/JTextComponent$AccessibleJTextComponent.h b/libjava/javax/swing/text/JTextComponent$AccessibleJTextComponent.h
new file mode 100644
index 000000000..ea8552a66
--- /dev/null
+++ b/libjava/javax/swing/text/JTextComponent$AccessibleJTextComponent.h
@@ -0,0 +1,95 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_JTextComponent$AccessibleJTextComponent__
+#define __javax_swing_text_JTextComponent$AccessibleJTextComponent__
+
+#pragma interface
+
+#include <javax/swing/JComponent$AccessibleJComponent.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Point;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleEditableText;
+        class AccessibleRole;
+        class AccessibleStateSet;
+        class AccessibleText;
+    }
+    namespace swing
+    {
+      namespace event
+      {
+          class CaretEvent;
+          class DocumentEvent;
+      }
+      namespace text
+      {
+          class AttributeSet;
+          class JTextComponent;
+          class JTextComponent$AccessibleJTextComponent;
+      }
+    }
+  }
+}
+
+class javax::swing::text::JTextComponent$AccessibleJTextComponent : public ::javax::swing::JComponent$AccessibleJComponent
+{
+
+public:
+  JTextComponent$AccessibleJTextComponent(::javax::swing::text::JTextComponent *);
+  virtual jint getCaretPosition();
+  virtual ::java::lang::String * getSelectedText();
+  virtual jint getSelectionStart();
+  virtual jint getSelectionEnd();
+  virtual void caretUpdate(::javax::swing::event::CaretEvent *);
+  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
+  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
+  virtual ::javax::accessibility::AccessibleEditableText * getAccessibleEditableText();
+  virtual ::javax::accessibility::AccessibleText * getAccessibleText();
+  virtual void insertUpdate(::javax::swing::event::DocumentEvent *);
+  virtual void removeUpdate(::javax::swing::event::DocumentEvent *);
+  virtual void changedUpdate(::javax::swing::event::DocumentEvent *);
+  virtual jint getIndexAtPoint(::java::awt::Point *);
+  virtual ::java::awt::Rectangle * getCharacterBounds(jint);
+  virtual jint getCharCount();
+  virtual ::javax::swing::text::AttributeSet * getCharacterAttribute(jint);
+  virtual ::java::lang::String * getAtIndex(jint, jint);
+  virtual ::java::lang::String * getAfterIndex(jint, jint);
+  virtual ::java::lang::String * getBeforeIndex(jint, jint);
+private:
+  ::java::lang::String * getAtIndexImpl(jint, jint, jint);
+public:
+  virtual jint getAccessibleActionCount();
+  virtual ::java::lang::String * getAccessibleActionDescription(jint);
+  virtual jboolean doAccessibleAction(jint);
+  virtual void setTextContents(::java::lang::String *);
+  virtual void insertTextAtIndex(jint, ::java::lang::String *);
+  virtual ::java::lang::String * getTextRange(jint, jint);
+  virtual void delete$(jint, jint);
+  virtual void cut(jint, jint);
+  virtual void paste(jint);
+  virtual void replaceText(jint, jint, ::java::lang::String *);
+  virtual void selectText(jint, jint);
+  virtual void setAttributes(jint, jint, ::javax::swing::text::AttributeSet *);
+private:
+  static const jlong serialVersionUID = 7664188944091413696LL;
+  jint __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) caretDot;
+public: // actually package-private
+  ::javax::swing::text::JTextComponent * this$0;
+  static jboolean $assertionsDisabled;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_JTextComponent$AccessibleJTextComponent__
diff --git a/libjava/javax/swing/text/JTextComponent$DefaultKeymap.h b/libjava/javax/swing/text/JTextComponent$DefaultKeymap.h
new file mode 100644
index 000000000..0e61fb476
--- /dev/null
+++ b/libjava/javax/swing/text/JTextComponent$DefaultKeymap.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_JTextComponent$DefaultKeymap__
+#define __javax_swing_text_JTextComponent$DefaultKeymap__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class Action;
+        class KeyStroke;
+      namespace text
+      {
+          class JTextComponent$DefaultKeymap;
+          class Keymap;
+      }
+    }
+  }
+}
+
+class javax::swing::text::JTextComponent$DefaultKeymap : public ::java::lang::Object
+{
+
+public:
+  JTextComponent$DefaultKeymap(::java::lang::String *);
+  virtual void addActionForKeyStroke(::javax::swing::KeyStroke *, ::javax::swing::Action *);
+  virtual ::javax::swing::Action * getAction(::javax::swing::KeyStroke *);
+  virtual JArray< ::javax::swing::Action * > * getBoundActions();
+  virtual JArray< ::javax::swing::KeyStroke * > * getBoundKeyStrokes();
+  virtual ::javax::swing::Action * getDefaultAction();
+  virtual JArray< ::javax::swing::KeyStroke * > * getKeyStrokesForAction(::javax::swing::Action *);
+  virtual ::java::lang::String * getName();
+  virtual ::javax::swing::text::Keymap * getResolveParent();
+  virtual jboolean isLocallyDefined(::javax::swing::KeyStroke *);
+  virtual void removeBindings();
+  virtual void removeKeyStrokeBinding(::javax::swing::KeyStroke *);
+  virtual void setDefaultAction(::javax::swing::Action *);
+  virtual void setResolveParent(::javax::swing::text::Keymap *);
+public: // actually package-private
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
+  ::javax::swing::text::Keymap * parent;
+  ::java::util::Hashtable * map;
+  ::javax::swing::Action * defaultAction;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_JTextComponent$DefaultKeymap__
diff --git a/libjava/javax/swing/text/JTextComponent$DefaultTransferHandler.h b/libjava/javax/swing/text/JTextComponent$DefaultTransferHandler.h
new file mode 100644
index 000000000..bdd3c56a8
--- /dev/null
+++ b/libjava/javax/swing/text/JTextComponent$DefaultTransferHandler.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_JTextComponent$DefaultTransferHandler__
+#define __javax_swing_text_JTextComponent$DefaultTransferHandler__
+
+#pragma interface
+
+#include <javax/swing/TransferHandler.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace datatransfer
+      {
+          class Clipboard;
+          class DataFlavor;
+          class Transferable;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JComponent;
+      namespace text
+      {
+          class JTextComponent;
+          class JTextComponent$DefaultTransferHandler;
+      }
+    }
+  }
+}
+
+class javax::swing::text::JTextComponent$DefaultTransferHandler : public ::javax::swing::TransferHandler
+{
+
+public: // actually package-private
+  JTextComponent$DefaultTransferHandler(::javax::swing::text::JTextComponent *);
+public:
+  virtual jboolean canImport(::javax::swing::JComponent *, JArray< ::java::awt::datatransfer::DataFlavor * > *);
+  virtual void exportToClipboard(::javax::swing::JComponent *, ::java::awt::datatransfer::Clipboard *, jint);
+  virtual jint getSourceActions();
+  virtual jboolean importData(::javax::swing::JComponent *, ::java::awt::datatransfer::Transferable *);
+public: // actually package-private
+  ::javax::swing::text::JTextComponent * __attribute__((aligned(__alignof__( ::javax::swing::TransferHandler)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_JTextComponent$DefaultTransferHandler__
diff --git a/libjava/javax/swing/text/JTextComponent$KeyBinding.h b/libjava/javax/swing/text/JTextComponent$KeyBinding.h
new file mode 100644
index 000000000..e3565c96f
--- /dev/null
+++ b/libjava/javax/swing/text/JTextComponent$KeyBinding.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_JTextComponent$KeyBinding__
+#define __javax_swing_text_JTextComponent$KeyBinding__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class KeyStroke;
+      namespace text
+      {
+          class JTextComponent$KeyBinding;
+      }
+    }
+  }
+}
+
+class javax::swing::text::JTextComponent$KeyBinding : public ::java::lang::Object
+{
+
+public:
+  JTextComponent$KeyBinding(::javax::swing::KeyStroke *, ::java::lang::String *);
+  ::javax::swing::KeyStroke * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
+  ::java::lang::String * actionName;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_JTextComponent$KeyBinding__
diff --git a/libjava/javax/swing/text/JTextComponent$KeymapActionMap.h b/libjava/javax/swing/text/JTextComponent$KeymapActionMap.h
new file mode 100644
index 000000000..9496d66b3
--- /dev/null
+++ b/libjava/javax/swing/text/JTextComponent$KeymapActionMap.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_JTextComponent$KeymapActionMap__
+#define __javax_swing_text_JTextComponent$KeymapActionMap__
+
+#pragma interface
+
+#include <javax/swing/ActionMap.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class Action;
+      namespace text
+      {
+          class JTextComponent;
+          class JTextComponent$KeymapActionMap;
+          class Keymap;
+      }
+    }
+  }
+}
+
+class javax::swing::text::JTextComponent$KeymapActionMap : public ::javax::swing::ActionMap
+{
+
+public:
+  JTextComponent$KeymapActionMap(::javax::swing::text::JTextComponent *, ::javax::swing::text::Keymap *);
+  virtual ::javax::swing::Action * get(::java::lang::Object *);
+  virtual jint size();
+  virtual JArray< ::java::lang::Object * > * keys();
+  virtual JArray< ::java::lang::Object * > * allKeys();
+public: // actually package-private
+  ::javax::swing::text::Keymap * __attribute__((aligned(__alignof__( ::javax::swing::ActionMap)))) map;
+  ::javax::swing::text::JTextComponent * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_JTextComponent$KeymapActionMap__
diff --git a/libjava/javax/swing/text/JTextComponent$KeymapWrapper.h b/libjava/javax/swing/text/JTextComponent$KeymapWrapper.h
new file mode 100644
index 000000000..07e02f3ff
--- /dev/null
+++ b/libjava/javax/swing/text/JTextComponent$KeymapWrapper.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_JTextComponent$KeymapWrapper__
+#define __javax_swing_text_JTextComponent$KeymapWrapper__
+
+#pragma interface
+
+#include <javax/swing/InputMap.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class KeyStroke;
+      namespace text
+      {
+          class JTextComponent;
+          class JTextComponent$KeymapWrapper;
+          class Keymap;
+      }
+    }
+  }
+}
+
+class javax::swing::text::JTextComponent$KeymapWrapper : public ::javax::swing::InputMap
+{
+
+public:
+  JTextComponent$KeymapWrapper(::javax::swing::text::JTextComponent *, ::javax::swing::text::Keymap *);
+  virtual jint size();
+  virtual ::java::lang::Object * get(::javax::swing::KeyStroke *);
+  virtual JArray< ::javax::swing::KeyStroke * > * keys();
+  virtual JArray< ::javax::swing::KeyStroke * > * allKeys();
+public: // actually package-private
+  ::javax::swing::text::Keymap * __attribute__((aligned(__alignof__( ::javax::swing::InputMap)))) map;
+  ::javax::swing::text::JTextComponent * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_JTextComponent$KeymapWrapper__
diff --git a/libjava/javax/swing/text/JTextComponent.h b/libjava/javax/swing/text/JTextComponent.h
new file mode 100644
index 000000000..cbaec0131
--- /dev/null
+++ b/libjava/javax/swing/text/JTextComponent.h
@@ -0,0 +1,173 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_JTextComponent__
+#define __javax_swing_text_JTextComponent__
+
+#pragma interface
+
+#include <javax/swing/JComponent.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Dimension;
+        class Insets;
+        class Point;
+        class Rectangle;
+      namespace event
+      {
+          class InputMethodListener;
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class Action;
+      namespace event
+      {
+          class CaretEvent;
+          class CaretListener;
+      }
+      namespace plaf
+      {
+          class TextUI;
+      }
+      namespace text
+      {
+          class Caret;
+          class Document;
+          class Highlighter;
+          class JTextComponent;
+          class JTextComponent$DefaultTransferHandler;
+          class JTextComponent$KeyBinding;
+          class Keymap;
+          class NavigationFilter;
+      }
+    }
+  }
+}
+
+class javax::swing::text::JTextComponent : public ::javax::swing::JComponent
+{
+
+public:
+  static ::javax::swing::text::Keymap * getKeymap(::java::lang::String *);
+  static ::javax::swing::text::Keymap * removeKeymap(::java::lang::String *);
+  static ::javax::swing::text::Keymap * addKeymap(::java::lang::String *, ::javax::swing::text::Keymap *);
+  virtual ::javax::swing::text::Keymap * getKeymap();
+  virtual void setKeymap(::javax::swing::text::Keymap *);
+  static void loadKeymap(::javax::swing::text::Keymap *, JArray< ::javax::swing::text::JTextComponent$KeyBinding * > *, JArray< ::javax::swing::Action * > *);
+  virtual JArray< ::javax::swing::Action * > * getActions();
+  JTextComponent();
+  virtual void setDocument(::javax::swing::text::Document *);
+  virtual ::javax::swing::text::Document * getDocument();
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+  virtual void setMargin(::java::awt::Insets *);
+  virtual ::java::awt::Insets * getMargin();
+  virtual void setText(::java::lang::String *);
+  virtual ::java::lang::String * getText();
+  virtual ::java::lang::String * getText(jint, jint);
+  virtual ::java::lang::String * getSelectedText();
+  virtual ::java::lang::String * getUIClassID();
+public: // actually protected
+  virtual ::java::lang::String * paramString();
+public:
+  virtual ::javax::swing::plaf::TextUI * getUI();
+  virtual void setUI(::javax::swing::plaf::TextUI *);
+  virtual void updateUI();
+  virtual ::java::awt::Dimension * getPreferredScrollableViewportSize();
+  virtual jint getScrollableUnitIncrement(::java::awt::Rectangle *, jint, jint);
+  virtual jint getScrollableBlockIncrement(::java::awt::Rectangle *, jint, jint);
+  virtual jboolean isEditable();
+  virtual void setEditable(jboolean);
+  virtual ::javax::swing::text::Caret * getCaret();
+  virtual void setCaret(::javax::swing::text::Caret *);
+  virtual ::java::awt::Color * getCaretColor();
+  virtual void setCaretColor(::java::awt::Color *);
+  virtual ::java::awt::Color * getDisabledTextColor();
+  virtual void setDisabledTextColor(::java::awt::Color *);
+  virtual ::java::awt::Color * getSelectedTextColor();
+  virtual void setSelectedTextColor(::java::awt::Color *);
+  virtual ::java::awt::Color * getSelectionColor();
+  virtual void setSelectionColor(::java::awt::Color *);
+  virtual jint getCaretPosition();
+  virtual void setCaretPosition(jint);
+  virtual void moveCaretPosition(jint);
+  virtual ::javax::swing::text::Highlighter * getHighlighter();
+  virtual void setHighlighter(::javax::swing::text::Highlighter *);
+  virtual jint getSelectionStart();
+  virtual void setSelectionStart(jint);
+  virtual jint getSelectionEnd();
+  virtual void setSelectionEnd(jint);
+  virtual void select(jint, jint);
+  virtual void selectAll();
+  virtual void replaceSelection(::java::lang::String *);
+  virtual jboolean getScrollableTracksViewportHeight();
+  virtual jboolean getScrollableTracksViewportWidth();
+  virtual void addCaretListener(::javax::swing::event::CaretListener *);
+  virtual void removeCaretListener(::javax::swing::event::CaretListener *);
+  virtual JArray< ::javax::swing::event::CaretListener * > * getCaretListeners();
+public: // actually protected
+  virtual void fireCaretUpdate(::javax::swing::event::CaretEvent *);
+public:
+  virtual void addInputMethodListener(::java::awt::event::InputMethodListener *);
+  virtual void removeInputMethodListener(::java::awt::event::InputMethodListener *);
+  virtual JArray< ::java::awt::event::InputMethodListener * > * getInputMethodListeners();
+  virtual ::java::awt::Rectangle * modelToView(jint);
+  virtual jboolean getDragEnabled();
+  virtual void setDragEnabled(jboolean);
+  virtual jint viewToModel(::java::awt::Point *);
+  virtual void copy();
+  virtual void cut();
+  virtual void paste();
+private:
+  void doTransferAction(::java::lang::String *, ::javax::swing::Action *);
+public:
+  virtual void setFocusAccelerator(jchar);
+  virtual jchar getFocusAccelerator();
+  virtual ::javax::swing::text::NavigationFilter * getNavigationFilter();
+  virtual void setNavigationFilter(::javax::swing::text::NavigationFilter *);
+  virtual void read(::java::io::Reader *, ::java::lang::Object *);
+  virtual void write(::java::io::Writer *);
+  virtual ::java::lang::String * getToolTipText(::java::awt::event::MouseEvent *);
+private:
+  static const jlong serialVersionUID = -8796518220218978795LL;
+public:
+  static ::java::lang::String * DEFAULT_KEYMAP;
+  static ::java::lang::String * FOCUS_ACCELERATOR_KEY;
+private:
+  static ::javax::swing::text::JTextComponent$DefaultTransferHandler * defaultTransferHandler;
+  static ::java::util::Hashtable * keymaps;
+  ::javax::swing::text::Keymap * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) keymap;
+  jchar focusAccelerator;
+  ::javax::swing::text::NavigationFilter * navigationFilter;
+public: // actually package-private
+  ::javax::swing::text::Document * doc;
+  ::javax::swing::text::Caret * caret;
+  jboolean editable;
+private:
+  ::javax::swing::text::Highlighter * highlighter;
+  ::java::awt::Color * caretColor;
+  ::java::awt::Color * disabledTextColor;
+  ::java::awt::Color * selectedTextColor;
+  ::java::awt::Color * selectionColor;
+  ::java::awt::Insets * margin;
+  jboolean dragEnabled;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_JTextComponent__
diff --git a/libjava/javax/swing/text/Keymap.h b/libjava/javax/swing/text/Keymap.h
new file mode 100644
index 000000000..6ec0a9816
--- /dev/null
+++ b/libjava/javax/swing/text/Keymap.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_Keymap__
+#define __javax_swing_text_Keymap__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class Action;
+        class KeyStroke;
+      namespace text
+      {
+          class Keymap;
+      }
+    }
+  }
+}
+
+class javax::swing::text::Keymap : public ::java::lang::Object
+{
+
+public:
+  virtual void addActionForKeyStroke(::javax::swing::KeyStroke *, ::javax::swing::Action *) = 0;
+  virtual ::javax::swing::Action * getAction(::javax::swing::KeyStroke *) = 0;
+  virtual JArray< ::javax::swing::Action * > * getBoundActions() = 0;
+  virtual JArray< ::javax::swing::KeyStroke * > * getBoundKeyStrokes() = 0;
+  virtual ::javax::swing::Action * getDefaultAction() = 0;
+  virtual JArray< ::javax::swing::KeyStroke * > * getKeyStrokesForAction(::javax::swing::Action *) = 0;
+  virtual ::java::lang::String * getName() = 0;
+  virtual ::javax::swing::text::Keymap * getResolveParent() = 0;
+  virtual jboolean isLocallyDefined(::javax::swing::KeyStroke *) = 0;
+  virtual void removeBindings() = 0;
+  virtual void removeKeyStrokeBinding(::javax::swing::KeyStroke *) = 0;
+  virtual void setDefaultAction(::javax::swing::Action *) = 0;
+  virtual void setResolveParent(::javax::swing::text::Keymap *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_text_Keymap__
diff --git a/libjava/javax/swing/text/LabelView.h b/libjava/javax/swing/text/LabelView.h
new file mode 100644
index 000000000..0d616b228
--- /dev/null
+++ b/libjava/javax/swing/text/LabelView.h
@@ -0,0 +1,87 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_LabelView__
+#define __javax_swing_text_LabelView__
+
+#pragma interface
+
+#include <javax/swing/text/GlyphView.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Font;
+        class FontMetrics;
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class DocumentEvent;
+      }
+      namespace text
+      {
+          class Element;
+          class LabelView;
+          class ViewFactory;
+      }
+    }
+  }
+}
+
+class javax::swing::text::LabelView : public ::javax::swing::text::GlyphView
+{
+
+public:
+  LabelView(::javax::swing::text::Element *);
+public: // actually protected
+  virtual void setPropertiesFromAttributes();
+public:
+  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual ::java::awt::Color * getBackground();
+public: // actually protected
+  virtual void setBackground(::java::awt::Color *);
+public:
+  virtual ::java::awt::Color * getForeground();
+  virtual ::java::awt::Font * getFont();
+public: // actually protected
+  virtual ::java::awt::FontMetrics * getFontMetrics();
+public:
+  virtual jboolean isUnderline();
+public: // actually protected
+  virtual void setUnderline(jboolean);
+public:
+  virtual jboolean isSubscript();
+public: // actually protected
+  virtual void setSubscript(jboolean);
+public:
+  virtual jboolean isSuperscript();
+public: // actually protected
+  virtual void setSuperscript(jboolean);
+public:
+  virtual jboolean isStrikeThrough();
+public: // actually protected
+  virtual void setStrikeThrough(jboolean);
+public: // actually package-private
+  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::text::GlyphView)))) background;
+  ::java::awt::Color * foreground;
+  ::java::awt::Font * font;
+  jboolean strikeThrough;
+  jboolean underline;
+  jboolean subscript;
+  jboolean superscript;
+private:
+  jboolean valid;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_LabelView__
diff --git a/libjava/javax/swing/text/LayeredHighlighter$LayerPainter.h b/libjava/javax/swing/text/LayeredHighlighter$LayerPainter.h
new file mode 100644
index 000000000..306061f2b
--- /dev/null
+++ b/libjava/javax/swing/text/LayeredHighlighter$LayerPainter.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_LayeredHighlighter$LayerPainter__
+#define __javax_swing_text_LayeredHighlighter$LayerPainter__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class JTextComponent;
+          class LayeredHighlighter$LayerPainter;
+          class View;
+      }
+    }
+  }
+}
+
+class javax::swing::text::LayeredHighlighter$LayerPainter : public ::java::lang::Object
+{
+
+public:
+  LayeredHighlighter$LayerPainter();
+  virtual ::java::awt::Shape * paintLayer(::java::awt::Graphics *, jint, jint, ::java::awt::Shape *, ::javax::swing::text::JTextComponent *, ::javax::swing::text::View *) = 0;
+  virtual void paint(::java::awt::Graphics *, jint, jint, ::java::awt::Shape *, ::javax::swing::text::JTextComponent *) = 0;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_LayeredHighlighter$LayerPainter__
diff --git a/libjava/javax/swing/text/LayeredHighlighter.h b/libjava/javax/swing/text/LayeredHighlighter.h
new file mode 100644
index 000000000..504680a41
--- /dev/null
+++ b/libjava/javax/swing/text/LayeredHighlighter.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_LayeredHighlighter__
+#define __javax_swing_text_LayeredHighlighter__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Highlighter$Highlight;
+          class Highlighter$HighlightPainter;
+          class JTextComponent;
+          class LayeredHighlighter;
+          class View;
+      }
+    }
+  }
+}
+
+class javax::swing::text::LayeredHighlighter : public ::java::lang::Object
+{
+
+public:
+  LayeredHighlighter();
+  virtual void paintLayeredHighlights(::java::awt::Graphics *, jint, jint, ::java::awt::Shape *, ::javax::swing::text::JTextComponent *, ::javax::swing::text::View *) = 0;
+  virtual void install(::javax::swing::text::JTextComponent *) = 0;
+  virtual void deinstall(::javax::swing::text::JTextComponent *) = 0;
+  virtual ::java::lang::Object * addHighlight(jint, jint, ::javax::swing::text::Highlighter$HighlightPainter *) = 0;
+  virtual void removeAllHighlights() = 0;
+  virtual void removeHighlight(::java::lang::Object *) = 0;
+  virtual void changeHighlight(::java::lang::Object *, jint, jint) = 0;
+  virtual JArray< ::javax::swing::text::Highlighter$Highlight * > * getHighlights() = 0;
+  virtual void paint(::java::awt::Graphics *) = 0;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_LayeredHighlighter__
diff --git a/libjava/javax/swing/text/LayoutQueue.h b/libjava/javax/swing/text/LayoutQueue.h
new file mode 100644
index 000000000..0dcc8a797
--- /dev/null
+++ b/libjava/javax/swing/text/LayoutQueue.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_LayoutQueue__
+#define __javax_swing_text_LayoutQueue__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class LayoutQueue;
+      }
+    }
+  }
+}
+
+class javax::swing::text::LayoutQueue : public ::java::lang::Object
+{
+
+public:
+  LayoutQueue();
+  virtual void addTask(::java::lang::Runnable *);
+public: // actually protected
+  virtual ::java::lang::Runnable * waitForWork();
+public:
+  static ::javax::swing::text::LayoutQueue * getDefaultQueue();
+  static void setDefaultQueue(::javax::swing::text::LayoutQueue *);
+private:
+  static ::javax::swing::text::LayoutQueue * defaultQueue;
+  ::java::util::LinkedList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) list;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_LayoutQueue__
diff --git a/libjava/javax/swing/text/MaskFormatter.h b/libjava/javax/swing/text/MaskFormatter.h
new file mode 100644
index 000000000..d8651afc9
--- /dev/null
+++ b/libjava/javax/swing/text/MaskFormatter.h
@@ -0,0 +1,72 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_MaskFormatter__
+#define __javax_swing_text_MaskFormatter__
+
+#pragma interface
+
+#include <javax/swing/text/DefaultFormatter.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JFormattedTextField;
+      namespace text
+      {
+          class MaskFormatter;
+      }
+    }
+  }
+}
+
+class javax::swing::text::MaskFormatter : public ::javax::swing::text::DefaultFormatter
+{
+
+public:
+  MaskFormatter();
+  MaskFormatter(::java::lang::String *);
+  virtual ::java::lang::String * getMask();
+  virtual ::java::lang::String * getInvalidCharacters();
+  virtual void setInvalidCharacters(::java::lang::String *);
+  virtual ::java::lang::String * getValidCharacters();
+  virtual void setValidCharacters(::java::lang::String *);
+  virtual ::java::lang::String * getPlaceholder();
+  virtual void setPlaceholder(::java::lang::String *);
+  virtual jchar getPlaceholderCharacter();
+  virtual void setPlaceholderCharacter(jchar);
+  virtual jboolean getValueContainsLiteralCharacters();
+  virtual void setValueContainsLiteralCharacters(jboolean);
+  virtual void setMask(::java::lang::String *);
+  virtual void install(::javax::swing::JFormattedTextField *);
+  virtual ::java::lang::Object * stringToValue(::java::lang::String *);
+private:
+  ::java::lang::String * convertStringToValue(::java::lang::String *);
+public:
+  virtual ::java::lang::String * valueToString(::java::lang::Object *);
+private:
+  ::java::lang::String * convertValueToString(::java::lang::String *);
+  static const jchar NUM_CHAR = 35;
+  static const jchar ESCAPE_CHAR = 39;
+  static const jchar UPPERCASE_CHAR = 85;
+  static const jchar LOWERCASE_CHAR = 76;
+  static const jchar ALPHANUM_CHAR = 65;
+  static const jchar LETTER_CHAR = 63;
+  static const jchar ANYTHING_CHAR = 42;
+  static const jchar HEX_CHAR = 72;
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::text::DefaultFormatter)))) mask;
+  ::java::lang::String * invalidChars;
+  ::java::lang::String * validChars;
+  ::java::lang::String * placeHolder;
+  jchar placeHolderChar;
+  jboolean valueContainsLiteralCharacters;
+  static ::java::lang::String * hexString;
+public: // actually package-private
+  jint maskLength;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_MaskFormatter__
diff --git a/libjava/javax/swing/text/MutableAttributeSet.h b/libjava/javax/swing/text/MutableAttributeSet.h
new file mode 100644
index 000000000..d98305585
--- /dev/null
+++ b/libjava/javax/swing/text/MutableAttributeSet.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_MutableAttributeSet__
+#define __javax_swing_text_MutableAttributeSet__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AttributeSet;
+          class MutableAttributeSet;
+      }
+    }
+  }
+}
+
+class javax::swing::text::MutableAttributeSet : public ::java::lang::Object
+{
+
+public:
+  virtual void addAttribute(::java::lang::Object *, ::java::lang::Object *) = 0;
+  virtual void addAttributes(::javax::swing::text::AttributeSet *) = 0;
+  virtual void removeAttribute(::java::lang::Object *) = 0;
+  virtual void removeAttributes(::java::util::Enumeration *) = 0;
+  virtual void removeAttributes(::javax::swing::text::AttributeSet *) = 0;
+  virtual void setResolveParent(::javax::swing::text::AttributeSet *) = 0;
+  virtual jboolean containsAttribute(::java::lang::Object *, ::java::lang::Object *) = 0;
+  virtual jboolean containsAttributes(::javax::swing::text::AttributeSet *) = 0;
+  virtual ::javax::swing::text::AttributeSet * copyAttributes() = 0;
+  virtual ::java::lang::Object * getAttribute(::java::lang::Object *) = 0;
+  virtual jint getAttributeCount() = 0;
+  virtual ::java::util::Enumeration * getAttributeNames() = 0;
+  virtual ::javax::swing::text::AttributeSet * getResolveParent() = 0;
+  virtual jboolean isDefined(::java::lang::Object *) = 0;
+  virtual jboolean isEqual(::javax::swing::text::AttributeSet *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_text_MutableAttributeSet__
diff --git a/libjava/javax/swing/text/NavigationFilter$FilterBypass.h b/libjava/javax/swing/text/NavigationFilter$FilterBypass.h
new file mode 100644
index 000000000..5c771e222
--- /dev/null
+++ b/libjava/javax/swing/text/NavigationFilter$FilterBypass.h
@@ -0,0 +1,37 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_NavigationFilter$FilterBypass__
+#define __javax_swing_text_NavigationFilter$FilterBypass__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Caret;
+          class NavigationFilter$FilterBypass;
+          class Position$Bias;
+      }
+    }
+  }
+}
+
+class javax::swing::text::NavigationFilter$FilterBypass : public ::java::lang::Object
+{
+
+public:
+  NavigationFilter$FilterBypass();
+  virtual ::javax::swing::text::Caret * getCaret() = 0;
+  virtual void moveDot(jint, ::javax::swing::text::Position$Bias *) = 0;
+  virtual void setDot(jint, ::javax::swing::text::Position$Bias *) = 0;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_NavigationFilter$FilterBypass__
diff --git a/libjava/javax/swing/text/NavigationFilter.h b/libjava/javax/swing/text/NavigationFilter.h
new file mode 100644
index 000000000..533b6e50d
--- /dev/null
+++ b/libjava/javax/swing/text/NavigationFilter.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_NavigationFilter__
+#define __javax_swing_text_NavigationFilter__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class JTextComponent;
+          class NavigationFilter;
+          class NavigationFilter$FilterBypass;
+          class Position$Bias;
+      }
+    }
+  }
+}
+
+class javax::swing::text::NavigationFilter : public ::java::lang::Object
+{
+
+public:
+  NavigationFilter();
+  virtual void moveDot(::javax::swing::text::NavigationFilter$FilterBypass *, jint, ::javax::swing::text::Position$Bias *);
+  virtual void setDot(::javax::swing::text::NavigationFilter$FilterBypass *, jint, ::javax::swing::text::Position$Bias *);
+  virtual jint getNextVisualPositionFrom(::javax::swing::text::JTextComponent *, jint, ::javax::swing::text::Position$Bias *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_NavigationFilter__
diff --git a/libjava/javax/swing/text/NumberFormatter.h b/libjava/javax/swing/text/NumberFormatter.h
new file mode 100644
index 000000000..fe952fe46
--- /dev/null
+++ b/libjava/javax/swing/text/NumberFormatter.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_NumberFormatter__
+#define __javax_swing_text_NumberFormatter__
+
+#pragma interface
+
+#include <javax/swing/text/InternationalFormatter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace text
+    {
+        class Format;
+        class NumberFormat;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class NumberFormatter;
+      }
+    }
+  }
+}
+
+class javax::swing::text::NumberFormatter : public ::javax::swing::text::InternationalFormatter
+{
+
+public:
+  NumberFormatter();
+  NumberFormatter(::java::text::NumberFormat *);
+  virtual void setFormat(::java::text::Format *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_NumberFormatter__
diff --git a/libjava/javax/swing/text/ParagraphView$Row.h b/libjava/javax/swing/text/ParagraphView$Row.h
new file mode 100644
index 000000000..36a372a70
--- /dev/null
+++ b/libjava/javax/swing/text/ParagraphView$Row.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_ParagraphView$Row__
+#define __javax_swing_text_ParagraphView$Row__
+
+#pragma interface
+
+#include <javax/swing/text/BoxView.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class SizeRequirements;
+      namespace text
+      {
+          class Element;
+          class ParagraphView;
+          class ParagraphView$Row;
+          class ViewFactory;
+      }
+    }
+  }
+}
+
+class javax::swing::text::ParagraphView$Row : public ::javax::swing::text::BoxView
+{
+
+public: // actually package-private
+  ParagraphView$Row(::javax::swing::text::ParagraphView *, ::javax::swing::text::Element *);
+public:
+  virtual jshort getLeftInset();
+  virtual jfloat getAlignment(jint);
+public: // actually protected
+  virtual jint getViewIndexAtPosition(jint);
+  virtual void layoutMinorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
+  virtual ::javax::swing::SizeRequirements * calculateMinorAxisRequirements(jint, ::javax::swing::SizeRequirements *);
+  virtual void loadChildren(::javax::swing::text::ViewFactory *);
+public:
+  virtual jint getStartOffset();
+  virtual jint getEndOffset();
+public: // actually package-private
+  ::javax::swing::text::ParagraphView * __attribute__((aligned(__alignof__( ::javax::swing::text::BoxView)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_ParagraphView$Row__
diff --git a/libjava/javax/swing/text/ParagraphView.h b/libjava/javax/swing/text/ParagraphView.h
new file mode 100644
index 000000000..fc86f7398
--- /dev/null
+++ b/libjava/javax/swing/text/ParagraphView.h
@@ -0,0 +1,82 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_ParagraphView__
+#define __javax_swing_text_ParagraphView__
+
+#pragma interface
+
+#include <javax/swing/text/FlowView.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class DocumentEvent;
+      }
+      namespace text
+      {
+          class Element;
+          class ParagraphView;
+          class ParagraphView$Row;
+          class Position$Bias;
+          class TabSet;
+          class View;
+          class ViewFactory;
+      }
+    }
+  }
+}
+
+class javax::swing::text::ParagraphView : public ::javax::swing::text::FlowView
+{
+
+public:
+  ParagraphView(::javax::swing::text::Element *);
+  virtual jfloat nextTabStop(jfloat, jint);
+public: // actually protected
+  virtual ::javax::swing::text::View * createRow();
+public:
+  virtual jfloat getAlignment(jint);
+  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+public: // actually protected
+  virtual void setPropertiesFromAttributes();
+  virtual void setFirstLineIndent(jfloat);
+  virtual void setJustification(jint);
+  virtual void setLineSpacing(jfloat);
+  virtual ::javax::swing::text::View * getLayoutView(jint);
+  virtual jint getLayoutViewCount();
+  virtual ::javax::swing::text::TabSet * getTabSet();
+  virtual jint findOffsetToCharactersInString(JArray< jchar > *, jint);
+  virtual jint getClosestPositionTo(jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *, jint, JArray< ::javax::swing::text::Position$Bias * > *, jint, jint);
+  virtual jfloat getPartialSize(jint, jint);
+  virtual jfloat getTabBase();
+  virtual void adjustRow(::javax::swing::text::ParagraphView$Row *, jint, jint);
+public:
+  virtual ::javax::swing::text::View * breakView(jint, jfloat, ::java::awt::Shape *);
+  virtual jint getBreakWeight(jint, jfloat);
+public: // actually package-private
+  static jint access$0(::javax::swing::text::ParagraphView *);
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::javax::swing::text::FlowView)))) firstLineIndent;
+private:
+  jint justification;
+  jfloat lineSpacing;
+  ::javax::swing::text::TabSet * tabSet;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_ParagraphView__
diff --git a/libjava/javax/swing/text/PasswordView.h b/libjava/javax/swing/text/PasswordView.h
new file mode 100644
index 000000000..ba6d3ff47
--- /dev/null
+++ b/libjava/javax/swing/text/PasswordView.h
@@ -0,0 +1,58 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_PasswordView__
+#define __javax_swing_text_PasswordView__
+
+#pragma interface
+
+#include <javax/swing/text/FieldView.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Element;
+          class PasswordView;
+          class Position$Bias;
+      }
+    }
+  }
+}
+
+class javax::swing::text::PasswordView : public ::javax::swing::text::FieldView
+{
+
+public:
+  PasswordView(::javax::swing::text::Element *);
+public: // actually protected
+  virtual jint drawEchoCharacter(::java::awt::Graphics *, jint, jint, jchar);
+private:
+  jchar getEchoChar();
+public: // actually protected
+  virtual jint drawSelectedText(::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual jint drawUnselectedText(::java::awt::Graphics *, jint, jint, jint, jint);
+public:
+  virtual jfloat getPreferredSpan(jint);
+  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
+  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
+private:
+  JArray< jchar > * __attribute__((aligned(__alignof__( ::javax::swing::text::FieldView)))) oneCharBuffer;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_PasswordView__
diff --git a/libjava/javax/swing/text/PlainDocument.h b/libjava/javax/swing/text/PlainDocument.h
new file mode 100644
index 000000000..d3dc0dca6
--- /dev/null
+++ b/libjava/javax/swing/text/PlainDocument.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_PlainDocument__
+#define __javax_swing_text_PlainDocument__
+
+#pragma interface
+
+#include <javax/swing/text/AbstractDocument.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AbstractDocument$AbstractElement;
+          class AbstractDocument$Content;
+          class AbstractDocument$DefaultDocumentEvent;
+          class AttributeSet;
+          class Element;
+          class PlainDocument;
+      }
+    }
+  }
+}
+
+class javax::swing::text::PlainDocument : public ::javax::swing::text::AbstractDocument
+{
+
+public:
+  PlainDocument();
+  PlainDocument(::javax::swing::text::AbstractDocument$Content *);
+private:
+  void reindex();
+public: // actually protected
+  virtual ::javax::swing::text::AbstractDocument$AbstractElement * createDefaultRoot();
+  virtual void insertUpdate(::javax::swing::text::AbstractDocument$DefaultDocumentEvent *, ::javax::swing::text::AttributeSet *);
+  virtual void removeUpdate(::javax::swing::text::AbstractDocument$DefaultDocumentEvent *);
+public:
+  virtual ::javax::swing::text::Element * getDefaultRootElement();
+  virtual ::javax::swing::text::Element * getParagraphElement(jint);
+  virtual void insertString(jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *);
+private:
+  static const jlong serialVersionUID = 4758290289196893664LL;
+public:
+  static ::java::lang::String * lineLimitAttribute;
+  static ::java::lang::String * tabSizeAttribute;
+private:
+  ::javax::swing::text::Element * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractDocument)))) rootElement;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_PlainDocument__
diff --git a/libjava/javax/swing/text/PlainView.h b/libjava/javax/swing/text/PlainView.h
new file mode 100644
index 000000000..e6091b0fc
--- /dev/null
+++ b/libjava/javax/swing/text/PlainView.h
@@ -0,0 +1,103 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_PlainView__
+#define __javax_swing_text_PlainView__
+
+#pragma interface
+
+#include <javax/swing/text/View.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Font;
+        class FontMetrics;
+        class Graphics;
+        class Rectangle;
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class DocumentEvent;
+      }
+      namespace text
+      {
+          class Element;
+          class PlainView;
+          class Position$Bias;
+          class Segment;
+          class ViewFactory;
+      }
+    }
+  }
+}
+
+class javax::swing::text::PlainView : public ::javax::swing::text::View
+{
+
+public:
+  PlainView(::javax::swing::text::Element *);
+public: // actually protected
+  virtual void updateMetrics();
+  virtual ::java::awt::Rectangle * lineToRect(::java::awt::Shape *, jint);
+public:
+  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
+public: // actually protected
+  virtual void drawLine(jint, ::java::awt::Graphics *, jint, jint);
+  virtual jint drawSelectedText(::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual jint drawUnselectedText(::java::awt::Graphics *, jint, jint, jint, jint);
+public:
+  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
+public: // actually protected
+  virtual jint getTabSize();
+public:
+  virtual jfloat nextTabStop(jfloat, jint);
+public: // actually package-private
+  virtual jfloat determineMaxLineLength();
+public:
+  virtual jfloat getPreferredSpan(jint);
+  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
+public: // actually protected
+  virtual void updateDamage(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+public:
+  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+public: // actually protected
+  virtual void damageLineRange(jint, jint, ::java::awt::Shape *, ::java::awt::Component *);
+  virtual ::javax::swing::text::Segment * getLineBuffer();
+private:
+  void findLongestLine(jint, jint);
+  jint getLineLength(jint);
+public: // actually package-private
+  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::text::View)))) selectedColor;
+  ::java::awt::Color * unselectedColor;
+  ::java::awt::Color * disabledColor;
+  jint selectionStart;
+  jint selectionEnd;
+  ::java::awt::Font * font;
+  jfloat maxLineLength;
+  ::javax::swing::text::Element * longestLine;
+public: // actually protected
+  ::java::awt::FontMetrics * metrics;
+private:
+  ::javax::swing::text::Segment * lineBuffer;
+  jint tabBase;
+  jint tabSize;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_PlainView__
diff --git a/libjava/javax/swing/text/Position$Bias.h b/libjava/javax/swing/text/Position$Bias.h
new file mode 100644
index 000000000..0ae5a3570
--- /dev/null
+++ b/libjava/javax/swing/text/Position$Bias.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_Position$Bias__
+#define __javax_swing_text_Position$Bias__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Position$Bias;
+      }
+    }
+  }
+}
+
+class javax::swing::text::Position$Bias : public ::java::lang::Object
+{
+
+  Position$Bias(::java::lang::String *);
+public:
+  ::java::lang::String * toString();
+  static ::javax::swing::text::Position$Bias * Backward;
+  static ::javax::swing::text::Position$Bias * Forward;
+private:
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_Position$Bias__
diff --git a/libjava/javax/swing/text/Position.h b/libjava/javax/swing/text/Position.h
new file mode 100644
index 000000000..1561b25fc
--- /dev/null
+++ b/libjava/javax/swing/text/Position.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_Position__
+#define __javax_swing_text_Position__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Position;
+      }
+    }
+  }
+}
+
+class javax::swing::text::Position : public ::java::lang::Object
+{
+
+public:
+  virtual jint getOffset() = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_text_Position__
diff --git a/libjava/javax/swing/text/Segment.h b/libjava/javax/swing/text/Segment.h
new file mode 100644
index 000000000..f9d5d5a6e
--- /dev/null
+++ b/libjava/javax/swing/text/Segment.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_Segment__
+#define __javax_swing_text_Segment__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Segment;
+      }
+    }
+  }
+}
+
+class javax::swing::text::Segment : public ::java::lang::Object
+{
+
+public:
+  Segment();
+  Segment(JArray< jchar > *, jint, jint);
+  virtual ::java::lang::Object * clone();
+  virtual jchar current();
+  virtual jchar first();
+  virtual jint getBeginIndex();
+  virtual jint getEndIndex();
+  virtual jint getIndex();
+  virtual jchar last();
+  virtual jchar next();
+  virtual jchar previous();
+  virtual jchar setIndex(jint);
+  virtual ::java::lang::String * toString();
+  virtual void setPartialReturn(jboolean);
+  virtual jboolean isPartialReturn();
+private:
+  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) partialReturn;
+  jint current__;
+public:
+  JArray< jchar > * array;
+  jint count;
+  jint offset;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_Segment__
diff --git a/libjava/javax/swing/text/SimpleAttributeSet.h b/libjava/javax/swing/text/SimpleAttributeSet.h
new file mode 100644
index 000000000..0ea91af02
--- /dev/null
+++ b/libjava/javax/swing/text/SimpleAttributeSet.h
@@ -0,0 +1,65 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_SimpleAttributeSet__
+#define __javax_swing_text_SimpleAttributeSet__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AttributeSet;
+          class SimpleAttributeSet;
+      }
+    }
+  }
+}
+
+class javax::swing::text::SimpleAttributeSet : public ::java::lang::Object
+{
+
+public:
+  SimpleAttributeSet();
+  SimpleAttributeSet(::javax::swing::text::AttributeSet *);
+  virtual void addAttribute(::java::lang::Object *, ::java::lang::Object *);
+  virtual void addAttributes(::javax::swing::text::AttributeSet *);
+  virtual ::java::lang::Object * clone();
+  virtual jboolean containsAttribute(::java::lang::Object *, ::java::lang::Object *);
+public: // actually package-private
+  virtual jboolean containsAttributeLocally(::java::lang::Object *, ::java::lang::Object *);
+public:
+  virtual jboolean containsAttributes(::javax::swing::text::AttributeSet *);
+  virtual ::javax::swing::text::AttributeSet * copyAttributes();
+  virtual jboolean equals(::java::lang::Object *);
+  virtual ::java::lang::Object * getAttribute(::java::lang::Object *);
+  virtual jint getAttributeCount();
+  virtual ::java::util::Enumeration * getAttributeNames();
+  virtual ::javax::swing::text::AttributeSet * getResolveParent();
+  virtual jint hashCode();
+  virtual jboolean isDefined(::java::lang::Object *);
+  virtual jboolean isEmpty();
+  virtual jboolean isEqual(::javax::swing::text::AttributeSet *);
+  virtual void removeAttribute(::java::lang::Object *);
+  virtual void removeAttributes(::javax::swing::text::AttributeSet *);
+  virtual void removeAttributes(::java::util::Enumeration *);
+  virtual void setResolveParent(::javax::swing::text::AttributeSet *);
+  virtual ::java::lang::String * toString();
+private:
+  static const jlong serialVersionUID = 8267656273837665219LL;
+public:
+  static ::javax::swing::text::AttributeSet * EMPTY;
+public: // actually package-private
+  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::java::lang::Object)))) tab;
+  static jboolean $assertionsDisabled;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_SimpleAttributeSet__
diff --git a/libjava/javax/swing/text/StringContent$InsertUndo.h b/libjava/javax/swing/text/StringContent$InsertUndo.h
new file mode 100644
index 000000000..49415c169
--- /dev/null
+++ b/libjava/javax/swing/text/StringContent$InsertUndo.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_StringContent$InsertUndo__
+#define __javax_swing_text_StringContent$InsertUndo__
+
+#pragma interface
+
+#include <javax/swing/undo/AbstractUndoableEdit.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class StringContent;
+          class StringContent$InsertUndo;
+      }
+    }
+  }
+}
+
+class javax::swing::text::StringContent$InsertUndo : public ::javax::swing::undo::AbstractUndoableEdit
+{
+
+public:
+  StringContent$InsertUndo(::javax::swing::text::StringContent *, jint, jint);
+  virtual void undo();
+  virtual void redo();
+private:
+  jint __attribute__((aligned(__alignof__( ::javax::swing::undo::AbstractUndoableEdit)))) start;
+  jint length;
+  ::java::lang::String * redoContent;
+  ::java::util::Vector * positions;
+public: // actually package-private
+  ::javax::swing::text::StringContent * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_StringContent$InsertUndo__
diff --git a/libjava/javax/swing/text/StringContent$Mark.h b/libjava/javax/swing/text/StringContent$Mark.h
new file mode 100644
index 000000000..22d3f9f02
--- /dev/null
+++ b/libjava/javax/swing/text/StringContent$Mark.h
@@ -0,0 +1,37 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_StringContent$Mark__
+#define __javax_swing_text_StringContent$Mark__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class StringContent;
+          class StringContent$Mark;
+      }
+    }
+  }
+}
+
+class javax::swing::text::StringContent$Mark : public ::java::lang::Object
+{
+
+public: // actually package-private
+  StringContent$Mark(::javax::swing::text::StringContent *, jint);
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) mark;
+  jint refCount;
+  ::javax::swing::text::StringContent * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_StringContent$Mark__
diff --git a/libjava/javax/swing/text/StringContent$RemoveUndo.h b/libjava/javax/swing/text/StringContent$RemoveUndo.h
new file mode 100644
index 000000000..6c79aa06b
--- /dev/null
+++ b/libjava/javax/swing/text/StringContent$RemoveUndo.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_StringContent$RemoveUndo__
+#define __javax_swing_text_StringContent$RemoveUndo__
+
+#pragma interface
+
+#include <javax/swing/undo/AbstractUndoableEdit.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class StringContent;
+          class StringContent$RemoveUndo;
+      }
+    }
+  }
+}
+
+class javax::swing::text::StringContent$RemoveUndo : public ::javax::swing::undo::AbstractUndoableEdit
+{
+
+public:
+  StringContent$RemoveUndo(::javax::swing::text::StringContent *, jint, ::java::lang::String *);
+  virtual void undo();
+  virtual void redo();
+private:
+  jint __attribute__((aligned(__alignof__( ::javax::swing::undo::AbstractUndoableEdit)))) start;
+  jint len;
+  ::java::lang::String * undoString;
+public: // actually package-private
+  ::java::util::Vector * positions;
+  ::javax::swing::text::StringContent * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_StringContent$RemoveUndo__
diff --git a/libjava/javax/swing/text/StringContent$StickyPosition.h b/libjava/javax/swing/text/StringContent$StickyPosition.h
new file mode 100644
index 000000000..434bf590a
--- /dev/null
+++ b/libjava/javax/swing/text/StringContent$StickyPosition.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_StringContent$StickyPosition__
+#define __javax_swing_text_StringContent$StickyPosition__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class StringContent;
+          class StringContent$Mark;
+          class StringContent$StickyPosition;
+      }
+    }
+  }
+}
+
+class javax::swing::text::StringContent$StickyPosition : public ::java::lang::Object
+{
+
+public:
+  StringContent$StickyPosition(::javax::swing::text::StringContent *, jint);
+  virtual jint getOffset();
+public: // actually package-private
+  ::javax::swing::text::StringContent$Mark * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mark;
+  ::javax::swing::text::StringContent * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_StringContent$StickyPosition__
diff --git a/libjava/javax/swing/text/StringContent$UndoPosRef.h b/libjava/javax/swing/text/StringContent$UndoPosRef.h
new file mode 100644
index 000000000..82f8d2f66
--- /dev/null
+++ b/libjava/javax/swing/text/StringContent$UndoPosRef.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_StringContent$UndoPosRef__
+#define __javax_swing_text_StringContent$UndoPosRef__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class StringContent;
+          class StringContent$Mark;
+          class StringContent$UndoPosRef;
+      }
+    }
+  }
+}
+
+class javax::swing::text::StringContent$UndoPosRef : public ::java::lang::Object
+{
+
+public: // actually package-private
+  StringContent$UndoPosRef(::javax::swing::text::StringContent *, ::javax::swing::text::StringContent$Mark *);
+  virtual void reset();
+private:
+  ::javax::swing::text::StringContent$Mark * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mark;
+  jint undoOffset;
+public: // actually package-private
+  ::javax::swing::text::StringContent * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_StringContent$UndoPosRef__
diff --git a/libjava/javax/swing/text/StringContent.h b/libjava/javax/swing/text/StringContent.h
new file mode 100644
index 000000000..ca51a43d7
--- /dev/null
+++ b/libjava/javax/swing/text/StringContent.h
@@ -0,0 +1,71 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_StringContent__
+#define __javax_swing_text_StringContent__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Position;
+          class Segment;
+          class StringContent;
+      }
+      namespace undo
+      {
+          class UndoableEdit;
+      }
+    }
+  }
+}
+
+class javax::swing::text::StringContent : public ::java::lang::Object
+{
+
+public:
+  StringContent();
+  StringContent(jint);
+public: // actually protected
+  ::java::util::Vector * getPositionsInRange(::java::util::Vector *, jint, jint);
+public:
+  ::javax::swing::text::Position * createPosition(jint);
+  jint length();
+  ::javax::swing::undo::UndoableEdit * insertString(jint, ::java::lang::String *);
+  ::javax::swing::undo::UndoableEdit * remove(jint, jint);
+private:
+  void replace(jint, jint, JArray< jchar > *);
+public:
+  ::java::lang::String * getString(jint, jint);
+  void getChars(jint, jint, ::javax::swing::text::Segment *);
+public: // actually protected
+  void updateUndoPositions(::java::util::Vector *);
+public: // actually package-private
+  void checkLocation(jint, jint);
+  void garbageCollect();
+private:
+  static const jlong serialVersionUID = 4755994433709540381LL;
+public: // actually package-private
+  JArray< jchar > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) content;
+private:
+  jint count;
+public: // actually package-private
+  ::java::util::Vector * marks;
+private:
+  static JArray< jchar > * EMPTY;
+public: // actually package-private
+  ::java::lang::ref::ReferenceQueue * queueOfDeath;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_StringContent__
diff --git a/libjava/javax/swing/text/Style.h b/libjava/javax/swing/text/Style.h
new file mode 100644
index 000000000..ceb4aff71
--- /dev/null
+++ b/libjava/javax/swing/text/Style.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_Style__
+#define __javax_swing_text_Style__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ChangeListener;
+      }
+      namespace text
+      {
+          class AttributeSet;
+          class Style;
+      }
+    }
+  }
+}
+
+class javax::swing::text::Style : public ::java::lang::Object
+{
+
+public:
+  virtual ::java::lang::String * getName() = 0;
+  virtual void addChangeListener(::javax::swing::event::ChangeListener *) = 0;
+  virtual void removeChangeListener(::javax::swing::event::ChangeListener *) = 0;
+  virtual void addAttribute(::java::lang::Object *, ::java::lang::Object *) = 0;
+  virtual void addAttributes(::javax::swing::text::AttributeSet *) = 0;
+  virtual void removeAttribute(::java::lang::Object *) = 0;
+  virtual void removeAttributes(::java::util::Enumeration *) = 0;
+  virtual void removeAttributes(::javax::swing::text::AttributeSet *) = 0;
+  virtual void setResolveParent(::javax::swing::text::AttributeSet *) = 0;
+  virtual jboolean containsAttribute(::java::lang::Object *, ::java::lang::Object *) = 0;
+  virtual jboolean containsAttributes(::javax::swing::text::AttributeSet *) = 0;
+  virtual ::javax::swing::text::AttributeSet * copyAttributes() = 0;
+  virtual ::java::lang::Object * getAttribute(::java::lang::Object *) = 0;
+  virtual jint getAttributeCount() = 0;
+  virtual ::java::util::Enumeration * getAttributeNames() = 0;
+  virtual ::javax::swing::text::AttributeSet * getResolveParent() = 0;
+  virtual jboolean isDefined(::java::lang::Object *) = 0;
+  virtual jboolean isEqual(::javax::swing::text::AttributeSet *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_text_Style__
diff --git a/libjava/javax/swing/text/StyleConstants$CharacterConstants.h b/libjava/javax/swing/text/StyleConstants$CharacterConstants.h
new file mode 100644
index 000000000..c9c84da18
--- /dev/null
+++ b/libjava/javax/swing/text/StyleConstants$CharacterConstants.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_StyleConstants$CharacterConstants__
+#define __javax_swing_text_StyleConstants$CharacterConstants__
+
+#pragma interface
+
+#include <javax/swing/text/StyleConstants.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class StyleConstants$CharacterConstants;
+      }
+    }
+  }
+}
+
+class javax::swing::text::StyleConstants$CharacterConstants : public ::javax::swing::text::StyleConstants
+{
+
+  StyleConstants$CharacterConstants(::java::lang::String *);
+public:
+  static ::java::lang::Object * Background;
+  static ::java::lang::Object * BidiLevel;
+  static ::java::lang::Object * Bold;
+  static ::java::lang::Object * ComponentAttribute;
+  static ::java::lang::Object * Family;
+  static ::java::lang::Object * Size;
+  static ::java::lang::Object * Foreground;
+  static ::java::lang::Object * IconAttribute;
+  static ::java::lang::Object * Italic;
+  static ::java::lang::Object * StrikeThrough;
+  static ::java::lang::Object * Subscript;
+  static ::java::lang::Object * Superscript;
+  static ::java::lang::Object * Underline;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_StyleConstants$CharacterConstants__
diff --git a/libjava/javax/swing/text/StyleConstants$ColorConstants.h b/libjava/javax/swing/text/StyleConstants$ColorConstants.h
new file mode 100644
index 000000000..31f2e67fa
--- /dev/null
+++ b/libjava/javax/swing/text/StyleConstants$ColorConstants.h
@@ -0,0 +1,34 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_StyleConstants$ColorConstants__
+#define __javax_swing_text_StyleConstants$ColorConstants__
+
+#pragma interface
+
+#include <javax/swing/text/StyleConstants.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class StyleConstants$ColorConstants;
+      }
+    }
+  }
+}
+
+class javax::swing::text::StyleConstants$ColorConstants : public ::javax::swing::text::StyleConstants
+{
+
+  StyleConstants$ColorConstants(::java::lang::String *);
+public:
+  static ::java::lang::Object * Foreground;
+  static ::java::lang::Object * Background;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_StyleConstants$ColorConstants__
diff --git a/libjava/javax/swing/text/StyleConstants$FontConstants.h b/libjava/javax/swing/text/StyleConstants$FontConstants.h
new file mode 100644
index 000000000..f2ae13ca6
--- /dev/null
+++ b/libjava/javax/swing/text/StyleConstants$FontConstants.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_StyleConstants$FontConstants__
+#define __javax_swing_text_StyleConstants$FontConstants__
+
+#pragma interface
+
+#include <javax/swing/text/StyleConstants.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class StyleConstants$FontConstants;
+      }
+    }
+  }
+}
+
+class javax::swing::text::StyleConstants$FontConstants : public ::javax::swing::text::StyleConstants
+{
+
+  StyleConstants$FontConstants(::java::lang::String *);
+public:
+  static ::java::lang::Object * Bold;
+  static ::java::lang::Object * Family;
+  static ::java::lang::Object * Italic;
+  static ::java::lang::Object * Size;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_StyleConstants$FontConstants__
diff --git a/libjava/javax/swing/text/StyleConstants$ParagraphConstants.h b/libjava/javax/swing/text/StyleConstants$ParagraphConstants.h
new file mode 100644
index 000000000..41381f8ba
--- /dev/null
+++ b/libjava/javax/swing/text/StyleConstants$ParagraphConstants.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_StyleConstants$ParagraphConstants__
+#define __javax_swing_text_StyleConstants$ParagraphConstants__
+
+#pragma interface
+
+#include <javax/swing/text/StyleConstants.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class StyleConstants$ParagraphConstants;
+      }
+    }
+  }
+}
+
+class javax::swing::text::StyleConstants$ParagraphConstants : public ::javax::swing::text::StyleConstants
+{
+
+  StyleConstants$ParagraphConstants(::java::lang::String *);
+public:
+  static ::java::lang::Object * Alignment;
+  static ::java::lang::Object * FirstLineIndent;
+  static ::java::lang::Object * LeftIndent;
+  static ::java::lang::Object * LineSpacing;
+  static ::java::lang::Object * Orientation;
+  static ::java::lang::Object * RightIndent;
+  static ::java::lang::Object * SpaceAbove;
+  static ::java::lang::Object * SpaceBelow;
+  static ::java::lang::Object * TabSet;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_StyleConstants$ParagraphConstants__
diff --git a/libjava/javax/swing/text/StyleConstants.h b/libjava/javax/swing/text/StyleConstants.h
new file mode 100644
index 000000000..1640d415d
--- /dev/null
+++ b/libjava/javax/swing/text/StyleConstants.h
@@ -0,0 +1,126 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_StyleConstants__
+#define __javax_swing_text_StyleConstants__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+      namespace text
+      {
+          class AttributeSet;
+          class MutableAttributeSet;
+          class StyleConstants;
+          class TabSet;
+      }
+    }
+  }
+}
+
+class javax::swing::text::StyleConstants : public ::java::lang::Object
+{
+
+public: // actually package-private
+  StyleConstants(::java::lang::String *);
+public:
+  virtual ::java::lang::String * toString();
+  static jint getAlignment(::javax::swing::text::AttributeSet *);
+  static ::java::awt::Color * getBackground(::javax::swing::text::AttributeSet *);
+  static jint getBidiLevel(::javax::swing::text::AttributeSet *);
+  static ::java::awt::Component * getComponent(::javax::swing::text::AttributeSet *);
+  static jfloat getFirstLineIndent(::javax::swing::text::AttributeSet *);
+  static ::java::lang::String * getFontFamily(::javax::swing::text::AttributeSet *);
+  static jint getFontSize(::javax::swing::text::AttributeSet *);
+  static ::java::awt::Color * getForeground(::javax::swing::text::AttributeSet *);
+  static ::javax::swing::Icon * getIcon(::javax::swing::text::AttributeSet *);
+  static jfloat getLeftIndent(::javax::swing::text::AttributeSet *);
+  static jfloat getLineSpacing(::javax::swing::text::AttributeSet *);
+  static jfloat getRightIndent(::javax::swing::text::AttributeSet *);
+  static jfloat getSpaceAbove(::javax::swing::text::AttributeSet *);
+  static jfloat getSpaceBelow(::javax::swing::text::AttributeSet *);
+  static ::javax::swing::text::TabSet * getTabSet(::javax::swing::text::AttributeSet *);
+  static jboolean isBold(::javax::swing::text::AttributeSet *);
+  static jboolean isItalic(::javax::swing::text::AttributeSet *);
+  static jboolean isStrikeThrough(::javax::swing::text::AttributeSet *);
+  static jboolean isSubscript(::javax::swing::text::AttributeSet *);
+  static jboolean isSuperscript(::javax::swing::text::AttributeSet *);
+  static jboolean isUnderline(::javax::swing::text::AttributeSet *);
+  static void setAlignment(::javax::swing::text::MutableAttributeSet *, jint);
+  static void setBackground(::javax::swing::text::MutableAttributeSet *, ::java::awt::Color *);
+  static void setBidiLevel(::javax::swing::text::MutableAttributeSet *, jint);
+  static void setBold(::javax::swing::text::MutableAttributeSet *, jboolean);
+  static void setComponent(::javax::swing::text::MutableAttributeSet *, ::java::awt::Component *);
+  static void setFirstLineIndent(::javax::swing::text::MutableAttributeSet *, jfloat);
+  static void setFontFamily(::javax::swing::text::MutableAttributeSet *, ::java::lang::String *);
+  static void setFontSize(::javax::swing::text::MutableAttributeSet *, jint);
+  static void setForeground(::javax::swing::text::MutableAttributeSet *, ::java::awt::Color *);
+  static void setIcon(::javax::swing::text::MutableAttributeSet *, ::javax::swing::Icon *);
+  static void setItalic(::javax::swing::text::MutableAttributeSet *, jboolean);
+  static void setLeftIndent(::javax::swing::text::MutableAttributeSet *, jfloat);
+  static void setLineSpacing(::javax::swing::text::MutableAttributeSet *, jfloat);
+  static void setRightIndent(::javax::swing::text::MutableAttributeSet *, jfloat);
+  static void setSpaceAbove(::javax::swing::text::MutableAttributeSet *, jfloat);
+  static void setSpaceBelow(::javax::swing::text::MutableAttributeSet *, jfloat);
+  static void setStrikeThrough(::javax::swing::text::MutableAttributeSet *, jboolean);
+  static void setSubscript(::javax::swing::text::MutableAttributeSet *, jboolean);
+  static void setSuperscript(::javax::swing::text::MutableAttributeSet *, jboolean);
+  static void setTabSet(::javax::swing::text::MutableAttributeSet *, ::javax::swing::text::TabSet *);
+  static void setUnderline(::javax::swing::text::MutableAttributeSet *, jboolean);
+  static const jint ALIGN_LEFT = 0;
+  static const jint ALIGN_CENTER = 1;
+  static const jint ALIGN_RIGHT = 2;
+  static const jint ALIGN_JUSTIFIED = 3;
+  static ::java::lang::Object * Background;
+  static ::java::lang::Object * BidiLevel;
+  static ::java::lang::Object * Bold;
+  static ::java::lang::Object * ComponentAttribute;
+  static ::java::lang::Object * Family;
+  static ::java::lang::Object * FontFamily;
+  static ::java::lang::Object * FontSize;
+  static ::java::lang::Object * Foreground;
+  static ::java::lang::Object * IconAttribute;
+  static ::java::lang::Object * Italic;
+  static ::java::lang::Object * Size;
+  static ::java::lang::Object * StrikeThrough;
+  static ::java::lang::Object * Subscript;
+  static ::java::lang::Object * Superscript;
+  static ::java::lang::Object * Underline;
+  static ::java::lang::Object * Alignment;
+  static ::java::lang::Object * FirstLineIndent;
+  static ::java::lang::Object * LeftIndent;
+  static ::java::lang::Object * LineSpacing;
+  static ::java::lang::Object * Orientation;
+  static ::java::lang::Object * RightIndent;
+  static ::java::lang::Object * SpaceAbove;
+  static ::java::lang::Object * SpaceBelow;
+  static ::java::lang::Object * TabSet;
+  static ::java::lang::String * ComponentElementName;
+  static ::java::lang::String * IconElementName;
+  static ::java::lang::Object * ComposedTextAttribute;
+  static ::java::lang::Object * ModelAttribute;
+  static ::java::lang::Object * NameAttribute;
+  static ::java::lang::Object * ResolveAttribute;
+public: // actually package-private
+  static ::java::util::ArrayList * keys;
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) keyname;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_StyleConstants__
diff --git a/libjava/javax/swing/text/StyleContext$1.h b/libjava/javax/swing/text/StyleContext$1.h
new file mode 100644
index 000000000..b3a20f9b7
--- /dev/null
+++ b/libjava/javax/swing/text/StyleContext$1.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_StyleContext$1__
+#define __javax_swing_text_StyleContext$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class StyleContext$1;
+          class StyleContext$SmallAttributeSet;
+      }
+    }
+  }
+}
+
+class javax::swing::text::StyleContext$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  StyleContext$1(::javax::swing::text::StyleContext$SmallAttributeSet *);
+public:
+  virtual jboolean hasMoreElements();
+  virtual ::java::lang::Object * nextElement();
+public: // actually package-private
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) i;
+  ::javax::swing::text::StyleContext$SmallAttributeSet * this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_StyleContext$1__
diff --git a/libjava/javax/swing/text/StyleContext$NamedStyle.h b/libjava/javax/swing/text/StyleContext$NamedStyle.h
new file mode 100644
index 000000000..6976975a7
--- /dev/null
+++ b/libjava/javax/swing/text/StyleContext$NamedStyle.h
@@ -0,0 +1,82 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_StyleContext$NamedStyle__
+#define __javax_swing_text_StyleContext$NamedStyle__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ChangeEvent;
+          class ChangeListener;
+          class EventListenerList;
+      }
+      namespace text
+      {
+          class AttributeSet;
+          class Style;
+          class StyleContext;
+          class StyleContext$NamedStyle;
+      }
+    }
+  }
+}
+
+class javax::swing::text::StyleContext$NamedStyle : public ::java::lang::Object
+{
+
+public:
+  StyleContext$NamedStyle(::javax::swing::text::StyleContext *);
+  StyleContext$NamedStyle(::javax::swing::text::StyleContext *, ::javax::swing::text::Style *);
+  StyleContext$NamedStyle(::javax::swing::text::StyleContext *, ::java::lang::String *, ::javax::swing::text::Style *);
+  virtual ::java::lang::String * getName();
+  virtual void setName(::java::lang::String *);
+  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
+  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
+  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
+  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
+public: // actually protected
+  virtual void fireStateChanged();
+public:
+  virtual void addAttribute(::java::lang::Object *, ::java::lang::Object *);
+  virtual void addAttributes(::javax::swing::text::AttributeSet *);
+  virtual jboolean containsAttribute(::java::lang::Object *, ::java::lang::Object *);
+  virtual jboolean containsAttributes(::javax::swing::text::AttributeSet *);
+  virtual ::javax::swing::text::AttributeSet * copyAttributes();
+  virtual ::java::lang::Object * getAttribute(::java::lang::Object *);
+  virtual jint getAttributeCount();
+  virtual ::java::util::Enumeration * getAttributeNames();
+  virtual jboolean isDefined(::java::lang::Object *);
+  virtual jboolean isEqual(::javax::swing::text::AttributeSet *);
+  virtual void removeAttribute(::java::lang::Object *);
+  virtual void removeAttributes(::javax::swing::text::AttributeSet *);
+  virtual void removeAttributes(::java::util::Enumeration *);
+  virtual ::javax::swing::text::AttributeSet * getResolveParent();
+  virtual void setResolveParent(::javax::swing::text::AttributeSet *);
+  virtual ::java::lang::String * toString();
+private:
+  void writeObject(::java::io::ObjectOutputStream *);
+  void readObject(::java::io::ObjectInputStream *);
+  static const jlong serialVersionUID = -6690628971806226374LL;
+public: // actually protected
+  ::javax::swing::event::ChangeEvent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) changeEvent;
+  ::javax::swing::event::EventListenerList * listenerList;
+private:
+  ::javax::swing::text::AttributeSet * attributes;
+public: // actually package-private
+  ::javax::swing::text::StyleContext * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_StyleContext$NamedStyle__
diff --git a/libjava/javax/swing/text/StyleContext$SimpleFontSpec.h b/libjava/javax/swing/text/StyleContext$SimpleFontSpec.h
new file mode 100644
index 000000000..a901647af
--- /dev/null
+++ b/libjava/javax/swing/text/StyleContext$SimpleFontSpec.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_StyleContext$SimpleFontSpec__
+#define __javax_swing_text_StyleContext$SimpleFontSpec__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class StyleContext$SimpleFontSpec;
+      }
+    }
+  }
+}
+
+class javax::swing::text::StyleContext$SimpleFontSpec : public ::java::lang::Object
+{
+
+public:
+  StyleContext$SimpleFontSpec(::java::lang::String *, jint, jint);
+  virtual jboolean equals(::java::lang::Object *);
+  virtual jint hashCode();
+public: // actually package-private
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) family;
+  jint style;
+  jint size;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_StyleContext$SimpleFontSpec__
diff --git a/libjava/javax/swing/text/StyleContext$SmallAttributeSet.h b/libjava/javax/swing/text/StyleContext$SmallAttributeSet.h
new file mode 100644
index 000000000..c4f969c1f
--- /dev/null
+++ b/libjava/javax/swing/text/StyleContext$SmallAttributeSet.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_StyleContext$SmallAttributeSet__
+#define __javax_swing_text_StyleContext$SmallAttributeSet__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AttributeSet;
+          class StyleContext;
+          class StyleContext$SmallAttributeSet;
+      }
+    }
+  }
+}
+
+class javax::swing::text::StyleContext$SmallAttributeSet : public ::java::lang::Object
+{
+
+public:
+  StyleContext$SmallAttributeSet(::javax::swing::text::StyleContext *, ::javax::swing::text::AttributeSet *);
+  StyleContext$SmallAttributeSet(::javax::swing::text::StyleContext *, JArray< ::java::lang::Object * > *);
+  virtual ::java::lang::Object * clone();
+  virtual jboolean containsAttribute(::java::lang::Object *, ::java::lang::Object *);
+  virtual jboolean containsAttributes(::javax::swing::text::AttributeSet *);
+  virtual ::javax::swing::text::AttributeSet * copyAttributes();
+  virtual jboolean equals(::java::lang::Object *);
+  virtual ::java::lang::Object * getAttribute(::java::lang::Object *);
+  virtual jint getAttributeCount();
+  virtual ::java::util::Enumeration * getAttributeNames();
+  virtual ::javax::swing::text::AttributeSet * getResolveParent();
+  virtual jint hashCode();
+  virtual jboolean isDefined(::java::lang::Object *);
+  virtual jboolean isEqual(::javax::swing::text::AttributeSet *);
+  virtual ::java::lang::String * toString();
+public: // actually package-private
+  JArray< ::java::lang::Object * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) attrs;
+private:
+  ::javax::swing::text::AttributeSet * resolveParent;
+public: // actually package-private
+  ::javax::swing::text::StyleContext * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_StyleContext$SmallAttributeSet__
diff --git a/libjava/javax/swing/text/StyleContext.h b/libjava/javax/swing/text/StyleContext.h
new file mode 100644
index 000000000..c8f91994e
--- /dev/null
+++ b/libjava/javax/swing/text/StyleContext.h
@@ -0,0 +1,110 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_StyleContext__
+#define __javax_swing_text_StyleContext__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Font;
+        class FontMetrics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ChangeListener;
+      }
+      namespace text
+      {
+          class AttributeSet;
+          class MutableAttributeSet;
+          class Style;
+          class StyleContext;
+          class StyleContext$NamedStyle;
+          class StyleContext$SmallAttributeSet;
+      }
+    }
+  }
+}
+
+class javax::swing::text::StyleContext : public ::java::lang::Object
+{
+
+public:
+  StyleContext();
+public: // actually protected
+  virtual ::javax::swing::text::StyleContext$SmallAttributeSet * createSmallAttributeSet(::javax::swing::text::AttributeSet *);
+  virtual ::javax::swing::text::MutableAttributeSet * createLargeAttributeSet(::javax::swing::text::AttributeSet *);
+public:
+  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
+  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
+  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
+  virtual ::javax::swing::text::Style * addStyle(::java::lang::String *, ::javax::swing::text::Style *);
+  virtual void removeStyle(::java::lang::String *);
+  virtual ::javax::swing::text::Style * getStyle(::java::lang::String *);
+  virtual ::java::util::Enumeration * getStyleNames();
+private:
+  void readObject(::java::io::ObjectInputStream *);
+  void writeObject(::java::io::ObjectOutputStream *);
+public:
+  virtual ::java::awt::Font * getFont(::javax::swing::text::AttributeSet *);
+  virtual ::java::awt::Font * getFont(::java::lang::String *, jint, jint);
+  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
+  virtual ::java::awt::Color * getForeground(::javax::swing::text::AttributeSet *);
+  virtual ::java::awt::Color * getBackground(::javax::swing::text::AttributeSet *);
+public: // actually protected
+  virtual jint getCompressionThreshold();
+public:
+  static ::javax::swing::text::StyleContext * getDefaultStyleContext();
+  virtual ::javax::swing::text::AttributeSet * addAttribute(::javax::swing::text::AttributeSet *, ::java::lang::Object *, ::java::lang::Object *);
+  virtual ::javax::swing::text::AttributeSet * addAttributes(::javax::swing::text::AttributeSet *, ::javax::swing::text::AttributeSet *);
+  virtual ::javax::swing::text::AttributeSet * getEmptySet();
+  virtual void reclaim(::javax::swing::text::AttributeSet *);
+  virtual ::javax::swing::text::AttributeSet * removeAttribute(::javax::swing::text::AttributeSet *, ::java::lang::Object *);
+  virtual ::javax::swing::text::AttributeSet * removeAttributes(::javax::swing::text::AttributeSet *, ::javax::swing::text::AttributeSet *);
+  virtual ::javax::swing::text::AttributeSet * removeAttributes(::javax::swing::text::AttributeSet *, ::java::util::Enumeration *);
+  static ::java::lang::Object * getStaticAttribute(::java::lang::Object *);
+  static ::java::lang::Object * getStaticAttributeKey(::java::lang::Object *);
+  static void readAttributeSet(::java::io::ObjectInputStream *, ::javax::swing::text::MutableAttributeSet *);
+  static void writeAttributeSet(::java::io::ObjectOutputStream *, ::javax::swing::text::AttributeSet *);
+  virtual void readAttributes(::java::io::ObjectInputStream *, ::javax::swing::text::MutableAttributeSet *);
+  virtual void writeAttributes(::java::io::ObjectOutputStream *, ::javax::swing::text::AttributeSet *);
+  static void registerStaticAttributeKey(::java::lang::Object *);
+  virtual ::java::lang::String * toString();
+private:
+  ::javax::swing::text::AttributeSet * searchImmutableSet();
+  void cleanupPool();
+  ::javax::swing::text::MutableAttributeSet * getMutableAttributeSet(::javax::swing::text::AttributeSet *);
+  static const jlong serialVersionUID = 8042858831190784241LL;
+public:
+  static ::java::lang::String * DEFAULT_STYLE;
+public: // actually package-private
+  static ::java::util::Hashtable * sharedAttributeSets;
+  static ::java::util::Hashtable * sharedFonts;
+  static ::javax::swing::text::StyleContext * defaultStyleContext;
+  static const jint compressionThreshold = 9;
+private:
+  static ::java::util::Hashtable * writeAttributeKeys;
+  static ::java::util::Hashtable * readAttributeKeys;
+  ::javax::swing::text::StyleContext$NamedStyle * __attribute__((aligned(__alignof__( ::java::lang::Object)))) styles;
+  ::javax::swing::text::MutableAttributeSet * search;
+  ::java::util::Map * attributeSetPool;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_StyleContext__
diff --git a/libjava/javax/swing/text/StyledDocument.h b/libjava/javax/swing/text/StyledDocument.h
new file mode 100644
index 000000000..2eb580ec2
--- /dev/null
+++ b/libjava/javax/swing/text/StyledDocument.h
@@ -0,0 +1,80 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_StyledDocument__
+#define __javax_swing_text_StyledDocument__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Font;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class DocumentListener;
+          class UndoableEditListener;
+      }
+      namespace text
+      {
+          class AttributeSet;
+          class Element;
+          class Position;
+          class Segment;
+          class Style;
+          class StyledDocument;
+      }
+    }
+  }
+}
+
+class javax::swing::text::StyledDocument : public ::java::lang::Object
+{
+
+public:
+  virtual ::javax::swing::text::Style * addStyle(::java::lang::String *, ::javax::swing::text::Style *) = 0;
+  virtual void removeStyle(::java::lang::String *) = 0;
+  virtual ::javax::swing::text::Style * getStyle(::java::lang::String *) = 0;
+  virtual void setCharacterAttributes(jint, jint, ::javax::swing::text::AttributeSet *, jboolean) = 0;
+  virtual void setParagraphAttributes(jint, jint, ::javax::swing::text::AttributeSet *, jboolean) = 0;
+  virtual ::javax::swing::text::Style * getLogicalStyle(jint) = 0;
+  virtual void setLogicalStyle(jint, ::javax::swing::text::Style *) = 0;
+  virtual ::javax::swing::text::Element * getParagraphElement(jint) = 0;
+  virtual ::javax::swing::text::Element * getCharacterElement(jint) = 0;
+  virtual ::java::awt::Color * getForeground(::javax::swing::text::AttributeSet *) = 0;
+  virtual ::java::awt::Color * getBackground(::javax::swing::text::AttributeSet *) = 0;
+  virtual ::java::awt::Font * getFont(::javax::swing::text::AttributeSet *) = 0;
+  virtual void addDocumentListener(::javax::swing::event::DocumentListener *) = 0;
+  virtual void addUndoableEditListener(::javax::swing::event::UndoableEditListener *) = 0;
+  virtual ::javax::swing::text::Position * createPosition(jint) = 0;
+  virtual ::javax::swing::text::Element * getDefaultRootElement() = 0;
+  virtual ::javax::swing::text::Position * getEndPosition() = 0;
+  virtual jint getLength() = 0;
+  virtual ::java::lang::Object * getProperty(::java::lang::Object *) = 0;
+  virtual JArray< ::javax::swing::text::Element * > * getRootElements() = 0;
+  virtual ::javax::swing::text::Position * getStartPosition() = 0;
+  virtual ::java::lang::String * getText(jint, jint) = 0;
+  virtual void getText(jint, jint, ::javax::swing::text::Segment *) = 0;
+  virtual void insertString(jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *) = 0;
+  virtual void putProperty(::java::lang::Object *, ::java::lang::Object *) = 0;
+  virtual void remove(jint, jint) = 0;
+  virtual void removeDocumentListener(::javax::swing::event::DocumentListener *) = 0;
+  virtual void removeUndoableEditListener(::javax::swing::event::UndoableEditListener *) = 0;
+  virtual void render(::java::lang::Runnable *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_text_StyledDocument__
diff --git a/libjava/javax/swing/text/StyledEditorKit$AlignmentAction.h b/libjava/javax/swing/text/StyledEditorKit$AlignmentAction.h
new file mode 100644
index 000000000..5056840d4
--- /dev/null
+++ b/libjava/javax/swing/text/StyledEditorKit$AlignmentAction.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_StyledEditorKit$AlignmentAction__
+#define __javax_swing_text_StyledEditorKit$AlignmentAction__
+
+#pragma interface
+
+#include <javax/swing/text/StyledEditorKit$StyledTextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class StyledEditorKit$AlignmentAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::StyledEditorKit$AlignmentAction : public ::javax::swing::text::StyledEditorKit$StyledTextAction
+{
+
+public:
+  StyledEditorKit$AlignmentAction(::java::lang::String *, jint);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+private:
+  jint __attribute__((aligned(__alignof__( ::javax::swing::text::StyledEditorKit$StyledTextAction)))) a;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_StyledEditorKit$AlignmentAction__
diff --git a/libjava/javax/swing/text/StyledEditorKit$BoldAction.h b/libjava/javax/swing/text/StyledEditorKit$BoldAction.h
new file mode 100644
index 000000000..53f1d4ce7
--- /dev/null
+++ b/libjava/javax/swing/text/StyledEditorKit$BoldAction.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_StyledEditorKit$BoldAction__
+#define __javax_swing_text_StyledEditorKit$BoldAction__
+
+#pragma interface
+
+#include <javax/swing/text/StyledEditorKit$StyledTextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class StyledEditorKit$BoldAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::StyledEditorKit$BoldAction : public ::javax::swing::text::StyledEditorKit$StyledTextAction
+{
+
+public:
+  StyledEditorKit$BoldAction();
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_StyledEditorKit$BoldAction__
diff --git a/libjava/javax/swing/text/StyledEditorKit$CaretTracker.h b/libjava/javax/swing/text/StyledEditorKit$CaretTracker.h
new file mode 100644
index 000000000..bda26b61b
--- /dev/null
+++ b/libjava/javax/swing/text/StyledEditorKit$CaretTracker.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_StyledEditorKit$CaretTracker__
+#define __javax_swing_text_StyledEditorKit$CaretTracker__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class CaretEvent;
+      }
+      namespace text
+      {
+          class StyledEditorKit;
+          class StyledEditorKit$CaretTracker;
+      }
+    }
+  }
+}
+
+class javax::swing::text::StyledEditorKit$CaretTracker : public ::java::lang::Object
+{
+
+public: // actually package-private
+  StyledEditorKit$CaretTracker(::javax::swing::text::StyledEditorKit *);
+public:
+  virtual void caretUpdate(::javax::swing::event::CaretEvent *);
+public: // actually package-private
+  ::javax::swing::text::StyledEditorKit * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_StyledEditorKit$CaretTracker__
diff --git a/libjava/javax/swing/text/StyledEditorKit$FontFamilyAction.h b/libjava/javax/swing/text/StyledEditorKit$FontFamilyAction.h
new file mode 100644
index 000000000..55ba13784
--- /dev/null
+++ b/libjava/javax/swing/text/StyledEditorKit$FontFamilyAction.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_StyledEditorKit$FontFamilyAction__
+#define __javax_swing_text_StyledEditorKit$FontFamilyAction__
+
+#pragma interface
+
+#include <javax/swing/text/StyledEditorKit$StyledTextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class StyledEditorKit$FontFamilyAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::StyledEditorKit$FontFamilyAction : public ::javax::swing::text::StyledEditorKit$StyledTextAction
+{
+
+public:
+  StyledEditorKit$FontFamilyAction(::java::lang::String *, ::java::lang::String *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+private:
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::text::StyledEditorKit$StyledTextAction)))) family;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_StyledEditorKit$FontFamilyAction__
diff --git a/libjava/javax/swing/text/StyledEditorKit$FontSizeAction.h b/libjava/javax/swing/text/StyledEditorKit$FontSizeAction.h
new file mode 100644
index 000000000..16d6cf3c8
--- /dev/null
+++ b/libjava/javax/swing/text/StyledEditorKit$FontSizeAction.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_StyledEditorKit$FontSizeAction__
+#define __javax_swing_text_StyledEditorKit$FontSizeAction__
+
+#pragma interface
+
+#include <javax/swing/text/StyledEditorKit$StyledTextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class StyledEditorKit$FontSizeAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::StyledEditorKit$FontSizeAction : public ::javax::swing::text::StyledEditorKit$StyledTextAction
+{
+
+public:
+  StyledEditorKit$FontSizeAction(::java::lang::String *, jint);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+private:
+  jint __attribute__((aligned(__alignof__( ::javax::swing::text::StyledEditorKit$StyledTextAction)))) size;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_StyledEditorKit$FontSizeAction__
diff --git a/libjava/javax/swing/text/StyledEditorKit$ForegroundAction.h b/libjava/javax/swing/text/StyledEditorKit$ForegroundAction.h
new file mode 100644
index 000000000..7b71ef570
--- /dev/null
+++ b/libjava/javax/swing/text/StyledEditorKit$ForegroundAction.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_StyledEditorKit$ForegroundAction__
+#define __javax_swing_text_StyledEditorKit$ForegroundAction__
+
+#pragma interface
+
+#include <javax/swing/text/StyledEditorKit$StyledTextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class StyledEditorKit$ForegroundAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::StyledEditorKit$ForegroundAction : public ::javax::swing::text::StyledEditorKit$StyledTextAction
+{
+
+public:
+  StyledEditorKit$ForegroundAction(::java::lang::String *, ::java::awt::Color *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+private:
+  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::text::StyledEditorKit$StyledTextAction)))) fg;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_StyledEditorKit$ForegroundAction__
diff --git a/libjava/javax/swing/text/StyledEditorKit$ItalicAction.h b/libjava/javax/swing/text/StyledEditorKit$ItalicAction.h
new file mode 100644
index 000000000..af60f01d3
--- /dev/null
+++ b/libjava/javax/swing/text/StyledEditorKit$ItalicAction.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_StyledEditorKit$ItalicAction__
+#define __javax_swing_text_StyledEditorKit$ItalicAction__
+
+#pragma interface
+
+#include <javax/swing/text/StyledEditorKit$StyledTextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class StyledEditorKit$ItalicAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::StyledEditorKit$ItalicAction : public ::javax::swing::text::StyledEditorKit$StyledTextAction
+{
+
+public:
+  StyledEditorKit$ItalicAction();
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_StyledEditorKit$ItalicAction__
diff --git a/libjava/javax/swing/text/StyledEditorKit$StyledTextAction.h b/libjava/javax/swing/text/StyledEditorKit$StyledTextAction.h
new file mode 100644
index 000000000..c85bc8c89
--- /dev/null
+++ b/libjava/javax/swing/text/StyledEditorKit$StyledTextAction.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_StyledEditorKit$StyledTextAction__
+#define __javax_swing_text_StyledEditorKit$StyledTextAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JEditorPane;
+      namespace text
+      {
+          class AttributeSet;
+          class StyledDocument;
+          class StyledEditorKit;
+          class StyledEditorKit$StyledTextAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::StyledEditorKit$StyledTextAction : public ::javax::swing::text::TextAction
+{
+
+public:
+  StyledEditorKit$StyledTextAction(::java::lang::String *);
+public: // actually protected
+  virtual ::javax::swing::JEditorPane * getEditor(::java::awt::event::ActionEvent *);
+  virtual void setCharacterAttributes(::javax::swing::JEditorPane *, ::javax::swing::text::AttributeSet *, jboolean);
+  virtual ::javax::swing::text::StyledDocument * getStyledDocument(::javax::swing::JEditorPane *);
+  virtual ::javax::swing::text::StyledEditorKit * getStyledEditorKit(::javax::swing::JEditorPane *);
+  virtual void setParagraphAttributes(::javax::swing::JEditorPane *, ::javax::swing::text::AttributeSet *, jboolean);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_StyledEditorKit$StyledTextAction__
diff --git a/libjava/javax/swing/text/StyledEditorKit$StyledViewFactory.h b/libjava/javax/swing/text/StyledEditorKit$StyledViewFactory.h
new file mode 100644
index 000000000..0e5ad47a9
--- /dev/null
+++ b/libjava/javax/swing/text/StyledEditorKit$StyledViewFactory.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_StyledEditorKit$StyledViewFactory__
+#define __javax_swing_text_StyledEditorKit$StyledViewFactory__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Element;
+          class StyledEditorKit$StyledViewFactory;
+          class View;
+      }
+    }
+  }
+}
+
+class javax::swing::text::StyledEditorKit$StyledViewFactory : public ::java::lang::Object
+{
+
+public: // actually package-private
+  StyledEditorKit$StyledViewFactory();
+public:
+  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_StyledEditorKit$StyledViewFactory__
diff --git a/libjava/javax/swing/text/StyledEditorKit$UnderlineAction.h b/libjava/javax/swing/text/StyledEditorKit$UnderlineAction.h
new file mode 100644
index 000000000..4df2fa6d1
--- /dev/null
+++ b/libjava/javax/swing/text/StyledEditorKit$UnderlineAction.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_StyledEditorKit$UnderlineAction__
+#define __javax_swing_text_StyledEditorKit$UnderlineAction__
+
+#pragma interface
+
+#include <javax/swing/text/StyledEditorKit$StyledTextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class StyledEditorKit$UnderlineAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::StyledEditorKit$UnderlineAction : public ::javax::swing::text::StyledEditorKit$StyledTextAction
+{
+
+public:
+  StyledEditorKit$UnderlineAction();
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_StyledEditorKit$UnderlineAction__
diff --git a/libjava/javax/swing/text/StyledEditorKit.h b/libjava/javax/swing/text/StyledEditorKit.h
new file mode 100644
index 000000000..e5ce1b4b4
--- /dev/null
+++ b/libjava/javax/swing/text/StyledEditorKit.h
@@ -0,0 +1,60 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_StyledEditorKit__
+#define __javax_swing_text_StyledEditorKit__
+
+#pragma interface
+
+#include <javax/swing/text/DefaultEditorKit.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class Action;
+        class JEditorPane;
+      namespace text
+      {
+          class Document;
+          class Element;
+          class MutableAttributeSet;
+          class StyledEditorKit;
+          class StyledEditorKit$CaretTracker;
+          class StyledEditorKit$StyledViewFactory;
+          class ViewFactory;
+      }
+    }
+  }
+}
+
+class javax::swing::text::StyledEditorKit : public ::javax::swing::text::DefaultEditorKit
+{
+
+public:
+  StyledEditorKit();
+  virtual ::java::lang::Object * clone();
+  virtual JArray< ::javax::swing::Action * > * getActions();
+  virtual ::javax::swing::text::MutableAttributeSet * getInputAttributes();
+  virtual ::javax::swing::text::Element * getCharacterAttributeRun();
+  virtual ::javax::swing::text::Document * createDefaultDocument();
+  virtual void install(::javax::swing::JEditorPane *);
+  virtual void deinstall(::javax::swing::JEditorPane *);
+  virtual ::javax::swing::text::ViewFactory * getViewFactory();
+public: // actually protected
+  virtual void createInputAttributes(::javax::swing::text::Element *, ::javax::swing::text::MutableAttributeSet *);
+private:
+  static const jlong serialVersionUID = 7002391892985555948LL;
+public: // actually package-private
+  ::javax::swing::text::Element * __attribute__((aligned(__alignof__( ::javax::swing::text::DefaultEditorKit)))) currentRun;
+  ::javax::swing::text::MutableAttributeSet * inputAttributes;
+  ::javax::swing::text::StyledEditorKit$CaretTracker * caretTracker;
+  ::javax::swing::text::StyledEditorKit$StyledViewFactory * viewFactory;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_StyledEditorKit__
diff --git a/libjava/javax/swing/text/TabExpander.h b/libjava/javax/swing/text/TabExpander.h
new file mode 100644
index 000000000..8983223a4
--- /dev/null
+++ b/libjava/javax/swing/text/TabExpander.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_TabExpander__
+#define __javax_swing_text_TabExpander__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class TabExpander;
+      }
+    }
+  }
+}
+
+class javax::swing::text::TabExpander : public ::java::lang::Object
+{
+
+public:
+  virtual jfloat nextTabStop(jfloat, jint) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_text_TabExpander__
diff --git a/libjava/javax/swing/text/TabSet.h b/libjava/javax/swing/text/TabSet.h
new file mode 100644
index 000000000..943a11509
--- /dev/null
+++ b/libjava/javax/swing/text/TabSet.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_TabSet__
+#define __javax_swing_text_TabSet__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class TabSet;
+          class TabStop;
+      }
+    }
+  }
+}
+
+class javax::swing::text::TabSet : public ::java::lang::Object
+{
+
+public:
+  TabSet(JArray< ::javax::swing::text::TabStop * > *);
+  virtual ::javax::swing::text::TabStop * getTab(jint);
+  virtual ::javax::swing::text::TabStop * getTabAfter(jfloat);
+  virtual jint getTabCount();
+  virtual jint getTabIndex(::javax::swing::text::TabStop *);
+  virtual jint getTabIndexAfter(jfloat);
+  virtual jboolean equals(::java::lang::Object *);
+  virtual jint hashCode();
+  virtual ::java::lang::String * toString();
+private:
+  static const jlong serialVersionUID = 2367703481999080593LL;
+public: // actually package-private
+  JArray< ::javax::swing::text::TabStop * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) tabs;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_TabSet__
diff --git a/libjava/javax/swing/text/TabStop.h b/libjava/javax/swing/text/TabStop.h
new file mode 100644
index 000000000..cc8fb1232
--- /dev/null
+++ b/libjava/javax/swing/text/TabStop.h
@@ -0,0 +1,58 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_TabStop__
+#define __javax_swing_text_TabStop__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class TabStop;
+      }
+    }
+  }
+}
+
+class javax::swing::text::TabStop : public ::java::lang::Object
+{
+
+public:
+  TabStop(jfloat);
+  TabStop(jfloat, jint, jint);
+  virtual jboolean equals(::java::lang::Object *);
+  virtual jint getAlignment();
+  virtual jint getLeader();
+  virtual jfloat getPosition();
+  virtual jint hashCode();
+  virtual ::java::lang::String * toString();
+private:
+  static const jlong serialVersionUID = -5381995917363605058LL;
+public:
+  static const jint ALIGN_LEFT = 0;
+  static const jint ALIGN_RIGHT = 1;
+  static const jint ALIGN_CENTER = 2;
+  static const jint ALIGN_DECIMAL = 4;
+  static const jint ALIGN_BAR = 5;
+  static const jint LEAD_NONE = 0;
+  static const jint LEAD_DOTS = 1;
+  static const jint LEAD_HYPHENS = 2;
+  static const jint LEAD_UNDERLINE = 3;
+  static const jint LEAD_THICKLINE = 4;
+  static const jint LEAD_EQUALS = 5;
+public: // actually package-private
+  jfloat __attribute__((aligned(__alignof__( ::java::lang::Object)))) pos;
+  jint align;
+  jint leader;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_TabStop__
diff --git a/libjava/javax/swing/text/TabableView.h b/libjava/javax/swing/text/TabableView.h
new file mode 100644
index 000000000..b9e9a7a86
--- /dev/null
+++ b/libjava/javax/swing/text/TabableView.h
@@ -0,0 +1,34 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_TabableView__
+#define __javax_swing_text_TabableView__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class TabExpander;
+          class TabableView;
+      }
+    }
+  }
+}
+
+class javax::swing::text::TabableView : public ::java::lang::Object
+{
+
+public:
+  virtual jfloat getPartialSpan(jint, jint) = 0;
+  virtual jfloat getTabbedSpan(jfloat, ::javax::swing::text::TabExpander *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_text_TabableView__
diff --git a/libjava/javax/swing/text/TableView$TableCell.h b/libjava/javax/swing/text/TableView$TableCell.h
new file mode 100644
index 000000000..44efc2f6c
--- /dev/null
+++ b/libjava/javax/swing/text/TableView$TableCell.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_TableView$TableCell__
+#define __javax_swing_text_TableView$TableCell__
+
+#pragma interface
+
+#include <javax/swing/text/BoxView.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Element;
+          class TableView;
+          class TableView$TableCell;
+      }
+    }
+  }
+}
+
+class javax::swing::text::TableView$TableCell : public ::javax::swing::text::BoxView
+{
+
+public:
+  TableView$TableCell(::javax::swing::text::TableView *, ::javax::swing::text::Element *);
+  virtual jint getColumnCount();
+  virtual jint getRowCount();
+  virtual void setGridLocation(jint, jint);
+  virtual jint getGridRow();
+  virtual jint getGridColumn();
+private:
+  jint __attribute__((aligned(__alignof__( ::javax::swing::text::BoxView)))) row;
+  jint column;
+public: // actually package-private
+  ::javax::swing::text::TableView * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_TableView$TableCell__
diff --git a/libjava/javax/swing/text/TableView$TableRow.h b/libjava/javax/swing/text/TableView$TableRow.h
new file mode 100644
index 000000000..0cb23241d
--- /dev/null
+++ b/libjava/javax/swing/text/TableView$TableRow.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_TableView$TableRow__
+#define __javax_swing_text_TableView$TableRow__
+
+#pragma interface
+
+#include <javax/swing/text/BoxView.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Element;
+          class TableView;
+          class TableView$TableRow;
+          class View;
+      }
+    }
+  }
+}
+
+class javax::swing::text::TableView$TableRow : public ::javax::swing::text::BoxView
+{
+
+public:
+  TableView$TableRow(::javax::swing::text::TableView *, ::javax::swing::text::Element *);
+  virtual void replace(jint, jint, JArray< ::javax::swing::text::View * > *);
+public: // actually protected
+  virtual void layoutMajorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
+  virtual void layoutMinorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
+public:
+  virtual jint getResizeWeight(jint);
+public: // actually protected
+  virtual ::javax::swing::text::View * getViewAtPosition(jint, ::java::awt::Rectangle *);
+public: // actually package-private
+  ::javax::swing::text::TableView * __attribute__((aligned(__alignof__( ::javax::swing::text::BoxView)))) this$0;
+  static jboolean $assertionsDisabled;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_TableView$TableRow__
diff --git a/libjava/javax/swing/text/TableView.h b/libjava/javax/swing/text/TableView.h
new file mode 100644
index 000000000..7bf5f8369
--- /dev/null
+++ b/libjava/javax/swing/text/TableView.h
@@ -0,0 +1,69 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_TableView__
+#define __javax_swing_text_TableView__
+
+#pragma interface
+
+#include <javax/swing/text/BoxView.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Rectangle;
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class SizeRequirements;
+      namespace event
+      {
+          class DocumentEvent;
+          class DocumentEvent$ElementChange;
+      }
+      namespace text
+      {
+          class Element;
+          class TableView;
+          class TableView$TableCell;
+          class TableView$TableRow;
+          class View;
+          class ViewFactory;
+      }
+    }
+  }
+}
+
+class javax::swing::text::TableView : public ::javax::swing::text::BoxView
+{
+
+public:
+  TableView(::javax::swing::text::Element *);
+  virtual void replace(jint, jint, JArray< ::javax::swing::text::View * > *);
+public: // actually protected
+  virtual ::javax::swing::text::TableView$TableRow * createTableRow(::javax::swing::text::Element *);
+  virtual ::javax::swing::text::TableView$TableCell * createTableCell(::javax::swing::text::Element *);
+  virtual void forwardUpdate(::javax::swing::event::DocumentEvent$ElementChange *, ::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual void layoutColumns(jint, JArray< jint > *, JArray< jint > *, JArray< ::javax::swing::SizeRequirements * > *);
+  virtual void layoutMinorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
+  virtual ::javax::swing::SizeRequirements * calculateMinorAxisRequirements(jint, ::javax::swing::SizeRequirements *);
+  virtual ::javax::swing::text::View * getViewAtPosition(jint, ::java::awt::Rectangle *);
+private:
+  void updateColumnRequirements();
+public: // actually package-private
+  JArray< jint > * __attribute__((aligned(__alignof__( ::javax::swing::text::BoxView)))) columnOffsets;
+  JArray< jint > * columnSpans;
+  JArray< ::javax::swing::SizeRequirements * > * columnRequirements;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_TableView__
diff --git a/libjava/javax/swing/text/TextAction$HorizontalMovementAction.h b/libjava/javax/swing/text/TextAction$HorizontalMovementAction.h
new file mode 100644
index 000000000..93bf43700
--- /dev/null
+++ b/libjava/javax/swing/text/TextAction$HorizontalMovementAction.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_TextAction$HorizontalMovementAction__
+#define __javax_swing_text_TextAction$HorizontalMovementAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Caret;
+          class TextAction$HorizontalMovementAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::TextAction$HorizontalMovementAction : public ::javax::swing::text::TextAction
+{
+
+public: // actually package-private
+  TextAction$HorizontalMovementAction(::java::lang::String *, jint);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually protected
+  virtual void actionPerformedImpl(::javax::swing::text::Caret *, jint) = 0;
+public: // actually package-private
+  jint __attribute__((aligned(__alignof__( ::javax::swing::text::TextAction)))) dir;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_TextAction$HorizontalMovementAction__
diff --git a/libjava/javax/swing/text/TextAction$VerticalMovementAction.h b/libjava/javax/swing/text/TextAction$VerticalMovementAction.h
new file mode 100644
index 000000000..b25ec52ce
--- /dev/null
+++ b/libjava/javax/swing/text/TextAction$VerticalMovementAction.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_TextAction$VerticalMovementAction__
+#define __javax_swing_text_TextAction$VerticalMovementAction__
+
+#pragma interface
+
+#include <javax/swing/text/TextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Caret;
+          class TextAction$VerticalMovementAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::TextAction$VerticalMovementAction : public ::javax::swing::text::TextAction
+{
+
+public: // actually package-private
+  TextAction$VerticalMovementAction(::java::lang::String *, jint);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually protected
+  virtual void actionPerformedImpl(::javax::swing::text::Caret *, jint) = 0;
+public: // actually package-private
+  jint __attribute__((aligned(__alignof__( ::javax::swing::text::TextAction)))) dir;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_TextAction$VerticalMovementAction__
diff --git a/libjava/javax/swing/text/TextAction.h b/libjava/javax/swing/text/TextAction.h
new file mode 100644
index 000000000..cfb9c1c98
--- /dev/null
+++ b/libjava/javax/swing/text/TextAction.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_TextAction__
+#define __javax_swing_text_TextAction__
+
+#pragma interface
+
+#include <javax/swing/AbstractAction.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Action;
+      namespace text
+      {
+          class JTextComponent;
+          class TextAction;
+      }
+    }
+  }
+}
+
+class javax::swing::text::TextAction : public ::javax::swing::AbstractAction
+{
+
+public:
+  TextAction(::java::lang::String *);
+public: // actually protected
+  virtual ::javax::swing::text::JTextComponent * getTextComponent(::java::awt::event::ActionEvent *);
+public:
+  static JArray< ::javax::swing::Action * > * augmentList(JArray< ::javax::swing::Action * > *, JArray< ::javax::swing::Action * > *);
+public: // actually protected
+  virtual ::javax::swing::text::JTextComponent * getFocusedComponent();
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_TextAction__
diff --git a/libjava/javax/swing/text/Utilities.h b/libjava/javax/swing/text/Utilities.h
new file mode 100644
index 000000000..ec04c43fe
--- /dev/null
+++ b/libjava/javax/swing/text/Utilities.h
@@ -0,0 +1,61 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_Utilities__
+#define __javax_swing_text_Utilities__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class FontMetrics;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Element;
+          class JTextComponent;
+          class Segment;
+          class TabExpander;
+          class Utilities;
+      }
+    }
+  }
+}
+
+class javax::swing::text::Utilities : public ::java::lang::Object
+{
+
+public:
+  Utilities();
+  static jint drawTabbedText(::javax::swing::text::Segment *, jint, jint, ::java::awt::Graphics *, ::javax::swing::text::TabExpander *, jint);
+  static jint getTabbedTextWidth(::javax::swing::text::Segment *, ::java::awt::FontMetrics *, jint, ::javax::swing::text::TabExpander *, jint);
+  static jint getTabbedTextOffset(::javax::swing::text::Segment *, ::java::awt::FontMetrics *, jint, jint, ::javax::swing::text::TabExpander *, jint, jboolean);
+  static jint getTabbedTextOffset(::javax::swing::text::Segment *, ::java::awt::FontMetrics *, jint, jint, ::javax::swing::text::TabExpander *, jint);
+  static jint getNextWord(::javax::swing::text::JTextComponent *, jint);
+  static jint getPreviousWord(::javax::swing::text::JTextComponent *, jint);
+  static jint getWordStart(::javax::swing::text::JTextComponent *, jint);
+  static jint getWordEnd(::javax::swing::text::JTextComponent *, jint);
+  static jint getRowEnd(::javax::swing::text::JTextComponent *, jint);
+  static jint getRowStart(::javax::swing::text::JTextComponent *, jint);
+  static jint getBreakLocation(::javax::swing::text::Segment *, ::java::awt::FontMetrics *, jint, jint, ::javax::swing::text::TabExpander *, jint);
+  static ::javax::swing::text::Element * getParagraphElement(::javax::swing::text::JTextComponent *, jint);
+  static jint getPositionAbove(::javax::swing::text::JTextComponent *, jint, jint);
+  static jint getPositionBelow(::javax::swing::text::JTextComponent *, jint, jint);
+public: // actually package-private
+  static jint getNextVisualPositionFrom(::javax::swing::text::JTextComponent *, jint, jint);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_Utilities__
diff --git a/libjava/javax/swing/text/View.h b/libjava/javax/swing/text/View.h
new file mode 100644
index 000000000..f9d97e573
--- /dev/null
+++ b/libjava/javax/swing/text/View.h
@@ -0,0 +1,116 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_View__
+#define __javax_swing_text_View__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Container;
+        class Graphics;
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class DocumentEvent;
+          class DocumentEvent$ElementChange;
+      }
+      namespace text
+      {
+          class AttributeSet;
+          class Document;
+          class Element;
+          class Position$Bias;
+          class View;
+          class ViewFactory;
+      }
+    }
+  }
+}
+
+class javax::swing::text::View : public ::java::lang::Object
+{
+
+public:
+  View(::javax::swing::text::Element *);
+  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *) = 0;
+  virtual void setParent(::javax::swing::text::View *);
+  virtual ::javax::swing::text::View * getParent();
+  virtual ::java::awt::Container * getContainer();
+  virtual ::javax::swing::text::Document * getDocument();
+  virtual ::javax::swing::text::Element * getElement();
+  virtual jfloat getPreferredSpan(jint) = 0;
+  virtual jint getResizeWeight(jint);
+  virtual jfloat getMaximumSpan(jint);
+  virtual jfloat getMinimumSpan(jint);
+  virtual void setSize(jfloat, jfloat);
+  virtual jfloat getAlignment(jint);
+  virtual ::javax::swing::text::AttributeSet * getAttributes();
+  virtual jboolean isVisible();
+  virtual jint getViewCount();
+  virtual ::javax::swing::text::View * getView(jint);
+  virtual ::javax::swing::text::ViewFactory * getViewFactory();
+  virtual void replace(jint, jint, JArray< ::javax::swing::text::View * > *);
+  virtual void insert(jint, ::javax::swing::text::View *);
+  virtual void append(::javax::swing::text::View *);
+  virtual void removeAll();
+  virtual void remove(jint);
+  virtual ::javax::swing::text::View * createFragment(jint, jint);
+  virtual jint getStartOffset();
+  virtual jint getEndOffset();
+  virtual ::java::awt::Shape * getChildAllocation(jint, ::java::awt::Shape *);
+  virtual jint getViewIndex(jfloat, jfloat, ::java::awt::Shape *);
+  virtual ::java::lang::String * getToolTipText(jfloat, jfloat, ::java::awt::Shape *);
+  virtual ::java::awt::Graphics * getGraphics();
+  virtual void preferenceChanged(::javax::swing::text::View *, jboolean, jboolean);
+  virtual jint getBreakWeight(jint, jfloat, jfloat);
+  virtual ::javax::swing::text::View * breakView(jint, jint, jfloat, jfloat);
+  virtual jint getViewIndex(jint, ::javax::swing::text::Position$Bias *);
+  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+public: // actually protected
+  virtual jboolean updateChildren(::javax::swing::event::DocumentEvent$ElementChange *, ::javax::swing::event::DocumentEvent *, ::javax::swing::text::ViewFactory *);
+  virtual void forwardUpdate(::javax::swing::event::DocumentEvent$ElementChange *, ::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual void forwardUpdateToView(::javax::swing::text::View *, ::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual void updateLayout(::javax::swing::event::DocumentEvent$ElementChange *, ::javax::swing::event::DocumentEvent *, ::java::awt::Shape *);
+public:
+  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *) = 0;
+  virtual ::java::awt::Shape * modelToView(jint, ::javax::swing::text::Position$Bias *, jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *);
+  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *);
+  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *) = 0;
+  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *);
+public: // actually protected
+  virtual void dump();
+public: // actually package-private
+  virtual void dump(jint);
+public:
+  virtual jint getNextVisualPositionFrom(jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
+  static const jint BadBreakWeight = 0;
+  static const jint ExcellentBreakWeight = 2000;
+  static const jint ForcedBreakWeight = 3000;
+  static const jint GoodBreakWeight = 1000;
+  static const jint X_AXIS = 0;
+  static const jint Y_AXIS = 1;
+private:
+  ::javax::swing::text::Element * __attribute__((aligned(__alignof__( ::java::lang::Object)))) elt;
+  ::javax::swing::text::View * parent;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_View__
diff --git a/libjava/javax/swing/text/ViewFactory.h b/libjava/javax/swing/text/ViewFactory.h
new file mode 100644
index 000000000..a65181ab2
--- /dev/null
+++ b/libjava/javax/swing/text/ViewFactory.h
@@ -0,0 +1,34 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_ViewFactory__
+#define __javax_swing_text_ViewFactory__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Element;
+          class View;
+          class ViewFactory;
+      }
+    }
+  }
+}
+
+class javax::swing::text::ViewFactory : public ::java::lang::Object
+{
+
+public:
+  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_text_ViewFactory__
diff --git a/libjava/javax/swing/text/WrappedPlainView$WrappedLine.h b/libjava/javax/swing/text/WrappedPlainView$WrappedLine.h
new file mode 100644
index 000000000..c96da2234
--- /dev/null
+++ b/libjava/javax/swing/text/WrappedPlainView$WrappedLine.h
@@ -0,0 +1,67 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_WrappedPlainView$WrappedLine__
+#define __javax_swing_text_WrappedPlainView$WrappedLine__
+
+#pragma interface
+
+#include <javax/swing/text/View.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+        class Rectangle;
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class DocumentEvent;
+      }
+      namespace text
+      {
+          class Element;
+          class Position$Bias;
+          class ViewFactory;
+          class WrappedPlainView;
+          class WrappedPlainView$WrappedLine;
+      }
+    }
+  }
+}
+
+class javax::swing::text::WrappedPlainView$WrappedLine : public ::javax::swing::text::View
+{
+
+public:
+  WrappedPlainView$WrappedLine(::javax::swing::text::WrappedPlainView *, ::javax::swing::text::Element *);
+  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
+private:
+  jint determineNumLines();
+public:
+  virtual jfloat getPreferredSpan(jint);
+  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
+  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
+public: // actually package-private
+  virtual void updateDamage(::java::awt::Rectangle *);
+public:
+  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+public: // actually package-private
+  jint __attribute__((aligned(__alignof__( ::javax::swing::text::View)))) numLines;
+  ::javax::swing::text::WrappedPlainView * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_WrappedPlainView$WrappedLine__
diff --git a/libjava/javax/swing/text/WrappedPlainView$WrappedLineCreator.h b/libjava/javax/swing/text/WrappedPlainView$WrappedLineCreator.h
new file mode 100644
index 000000000..eb249a0c0
--- /dev/null
+++ b/libjava/javax/swing/text/WrappedPlainView$WrappedLineCreator.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_WrappedPlainView$WrappedLineCreator__
+#define __javax_swing_text_WrappedPlainView$WrappedLineCreator__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Element;
+          class View;
+          class WrappedPlainView;
+          class WrappedPlainView$WrappedLineCreator;
+      }
+    }
+  }
+}
+
+class javax::swing::text::WrappedPlainView$WrappedLineCreator : public ::java::lang::Object
+{
+
+public: // actually package-private
+  WrappedPlainView$WrappedLineCreator(::javax::swing::text::WrappedPlainView *);
+public:
+  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *);
+public: // actually package-private
+  ::javax::swing::text::WrappedPlainView * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_WrappedPlainView$WrappedLineCreator__
diff --git a/libjava/javax/swing/text/WrappedPlainView.h b/libjava/javax/swing/text/WrappedPlainView.h
new file mode 100644
index 000000000..1082073cc
--- /dev/null
+++ b/libjava/javax/swing/text/WrappedPlainView.h
@@ -0,0 +1,92 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_WrappedPlainView__
+#define __javax_swing_text_WrappedPlainView__
+
+#pragma interface
+
+#include <javax/swing/text/BoxView.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class FontMetrics;
+        class Graphics;
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class DocumentEvent;
+      }
+      namespace text
+      {
+          class Element;
+          class Segment;
+          class ViewFactory;
+          class WrappedPlainView;
+      }
+    }
+  }
+}
+
+class javax::swing::text::WrappedPlainView : public ::javax::swing::text::BoxView
+{
+
+public:
+  WrappedPlainView(::javax::swing::text::Element *);
+  WrappedPlainView(::javax::swing::text::Element *, jboolean);
+public: // actually protected
+  virtual ::javax::swing::text::Segment * getLineBuffer();
+public:
+  virtual jfloat nextTabStop(jfloat, jint);
+public: // actually protected
+  virtual jint getTabSize();
+  virtual void drawLine(jint, jint, ::java::awt::Graphics *, jint, jint);
+  virtual jint drawSelectedText(::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual jint drawUnselectedText(::java::awt::Graphics *, jint, jint, jint, jint);
+  virtual void loadChildren(::javax::swing::text::ViewFactory *);
+  virtual jint calculateBreakPosition(jint, jint);
+public: // actually package-private
+  virtual void updateMetrics();
+public:
+  virtual jfloat getPreferredSpan(jint);
+  virtual jfloat getMinimumSpan(jint);
+  virtual jfloat getMaximumSpan(jint);
+  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+private:
+  void updateChildren(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *);
+public:
+  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
+  virtual void setSize(jfloat, jfloat);
+public: // actually package-private
+  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::text::BoxView)))) selectedColor;
+  ::java::awt::Color * unselectedColor;
+  ::java::awt::Color * disabledColor;
+  ::java::awt::FontMetrics * metrics;
+  jboolean wordWrap;
+  ::javax::swing::text::ViewFactory * viewFactory;
+  jint selectionStart;
+  jint selectionEnd;
+  jint lineHeight;
+private:
+  jint tabBase;
+  jint tabSize;
+  ::javax::swing::text::Segment * lineBuffer;
+public: // actually package-private
+  static jboolean $assertionsDisabled;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_WrappedPlainView__
diff --git a/libjava/javax/swing/text/ZoneView$Zone.h b/libjava/javax/swing/text/ZoneView$Zone.h
new file mode 100644
index 000000000..86a5bc87c
--- /dev/null
+++ b/libjava/javax/swing/text/ZoneView$Zone.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_ZoneView$Zone__
+#define __javax_swing_text_ZoneView$Zone__
+
+#pragma interface
+
+#include <javax/swing/text/AsyncBoxView.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Element;
+          class Position;
+          class ZoneView$Zone;
+      }
+    }
+  }
+}
+
+class javax::swing::text::ZoneView$Zone : public ::javax::swing::text::AsyncBoxView
+{
+
+public: // actually package-private
+  ZoneView$Zone(::javax::swing::text::Element *, ::javax::swing::text::Position *, ::javax::swing::text::Position *, jint);
+public:
+  virtual jint getStartOffset();
+  virtual jint getEndOffset();
+private:
+  ::javax::swing::text::Position * __attribute__((aligned(__alignof__( ::javax::swing::text::AsyncBoxView)))) p0;
+  ::javax::swing::text::Position * p1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_ZoneView$Zone__
diff --git a/libjava/javax/swing/text/ZoneView.h b/libjava/javax/swing/text/ZoneView.h
new file mode 100644
index 000000000..324d90c0a
--- /dev/null
+++ b/libjava/javax/swing/text/ZoneView.h
@@ -0,0 +1,74 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_ZoneView__
+#define __javax_swing_text_ZoneView__
+
+#pragma interface
+
+#include <javax/swing/text/BoxView.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class DocumentEvent;
+          class DocumentEvent$ElementChange;
+      }
+      namespace text
+      {
+          class Element;
+          class View;
+          class ViewFactory;
+          class ZoneView;
+      }
+    }
+  }
+}
+
+class javax::swing::text::ZoneView : public ::javax::swing::text::BoxView
+{
+
+public:
+  ZoneView(::javax::swing::text::Element *, jint);
+  virtual void setMaximumZoneSize(jint);
+  virtual jint getMaximumZoneSize();
+  virtual void setMaxZonesLoaded(jint);
+  virtual jint getMaxZonesLoaded();
+public: // actually protected
+  virtual void zoneWasLoaded(::javax::swing::text::View *);
+  virtual void unloadZone(::javax::swing::text::View *);
+  virtual jboolean isZoneLoaded(::javax::swing::text::View *);
+  virtual ::javax::swing::text::View * createZone(jint, jint);
+  virtual void loadChildren(::javax::swing::text::ViewFactory *);
+  virtual jint getViewIndexAtPosition(jint);
+public:
+  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+public: // actually protected
+  virtual jboolean updateChildren(::javax::swing::event::DocumentEvent$ElementChange *, ::javax::swing::event::DocumentEvent *, ::javax::swing::text::ViewFactory *);
+private:
+  void unloadOldestZones();
+  void checkZoneAt(jint);
+  void splitZone(jint, jint, jint);
+  jint getPreferredZoneEnd(jint);
+  jint __attribute__((aligned(__alignof__( ::javax::swing::text::BoxView)))) maximumZoneSize;
+  jint maxZonesLoaded;
+  ::java::util::LinkedList * loadedZones;
+public: // actually package-private
+  static jboolean $assertionsDisabled;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_ZoneView__
diff --git a/libjava/javax/swing/text/html/BRView.h b/libjava/javax/swing/text/html/BRView.h
new file mode 100644
index 000000000..aee03f09e
--- /dev/null
+++ b/libjava/javax/swing/text/html/BRView.h
@@ -0,0 +1,37 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_BRView__
+#define __javax_swing_text_html_BRView__
+
+#pragma interface
+
+#include <javax/swing/text/html/InlineView.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Element;
+        namespace html
+        {
+            class BRView;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::BRView : public ::javax::swing::text::html::InlineView
+{
+
+public:
+  BRView(::javax::swing::text::Element *);
+  virtual jint getBreakWeight(jint, jfloat, jfloat);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_BRView__
diff --git a/libjava/javax/swing/text/html/BlockView$PositionInfo.h b/libjava/javax/swing/text/html/BlockView$PositionInfo.h
new file mode 100644
index 000000000..1e19b610f
--- /dev/null
+++ b/libjava/javax/swing/text/html/BlockView$PositionInfo.h
@@ -0,0 +1,64 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_BlockView$PositionInfo__
+#define __javax_swing_text_html_BlockView$PositionInfo__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace swing
+      {
+        namespace text
+        {
+          namespace html
+          {
+            namespace css
+            {
+                class Length;
+            }
+          }
+        }
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace html
+        {
+            class BlockView$PositionInfo;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::BlockView$PositionInfo : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BlockView$PositionInfo(jint, ::gnu::javax::swing::text::html::css::Length *, ::gnu::javax::swing::text::html::css::Length *, ::gnu::javax::swing::text::html::css::Length *, ::gnu::javax::swing::text::html::css::Length *);
+  static const jint STATIC = 0;
+  static const jint RELATIVE = 1;
+  static const jint ABSOLUTE = 2;
+  static const jint FIXED = 3;
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
+  ::gnu::javax::swing::text::html::css::Length * left;
+  ::gnu::javax::swing::text::html::css::Length * right;
+  ::gnu::javax::swing::text::html::css::Length * top;
+  ::gnu::javax::swing::text::html::css::Length * bottom;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_BlockView$PositionInfo__
diff --git a/libjava/javax/swing/text/html/BlockView.h b/libjava/javax/swing/text/html/BlockView.h
new file mode 100644
index 000000000..b8608f5c0
--- /dev/null
+++ b/libjava/javax/swing/text/html/BlockView.h
@@ -0,0 +1,110 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_BlockView__
+#define __javax_swing_text_html_BlockView__
+
+#pragma interface
+
+#include <javax/swing/text/BoxView.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace swing
+      {
+        namespace text
+        {
+          namespace html
+          {
+            namespace css
+            {
+                class Length;
+            }
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class SizeRequirements;
+      namespace event
+      {
+          class DocumentEvent;
+      }
+      namespace text
+      {
+          class AttributeSet;
+          class Element;
+          class View;
+          class ViewFactory;
+        namespace html
+        {
+            class BlockView;
+            class StyleSheet;
+            class StyleSheet$BoxPainter;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::BlockView : public ::javax::swing::text::BoxView
+{
+
+public:
+  BlockView(::javax::swing::text::Element *, jint);
+  virtual void setParent(::javax::swing::text::View *);
+public: // actually protected
+  virtual ::javax::swing::SizeRequirements * calculateMajorAxisRequirements(jint, ::javax::swing::SizeRequirements *);
+  virtual ::javax::swing::SizeRequirements * calculateMinorAxisRequirements(jint, ::javax::swing::SizeRequirements *);
+private:
+  jboolean setCSSSpan(::javax::swing::SizeRequirements *, jint);
+  void constrainSize(jint, ::javax::swing::SizeRequirements *, ::javax::swing::SizeRequirements *);
+public: // actually protected
+  virtual void layoutMinorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
+  virtual void layoutMajorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
+private:
+  void positionView(jint, jint, jint, JArray< jint > *, JArray< jint > *);
+public:
+  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
+  virtual ::javax::swing::text::AttributeSet * getAttributes();
+  virtual jint getResizeWeight(jint);
+  virtual jfloat getAlignment(jint);
+  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual jfloat getPreferredSpan(jint);
+  virtual jfloat getMinimumSpan(jint);
+  virtual jfloat getMaximumSpan(jint);
+public: // actually protected
+  virtual void setPropertiesFromAttributes();
+  virtual ::javax::swing::text::html::StyleSheet * getStyleSheet();
+public:
+  virtual void replace(jint, jint, JArray< ::javax::swing::text::View * > *);
+private:
+  void fetchLayoutInfo(::javax::swing::text::View *);
+  ::javax::swing::text::AttributeSet * __attribute__((aligned(__alignof__( ::javax::swing::text::BoxView)))) attributes;
+public: // actually package-private
+  ::javax::swing::text::html::StyleSheet$BoxPainter * painter;
+private:
+  JArray< ::gnu::javax::swing::text::html::css::Length * > * cssSpans;
+  ::java::util::HashMap * positionInfo;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_BlockView__
diff --git a/libjava/javax/swing/text/html/CSS$Attribute.h b/libjava/javax/swing/text/html/CSS$Attribute.h
new file mode 100644
index 000000000..44c82500b
--- /dev/null
+++ b/libjava/javax/swing/text/html/CSS$Attribute.h
@@ -0,0 +1,112 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_CSS$Attribute__
+#define __javax_swing_text_html_CSS$Attribute__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace html
+        {
+            class CSS$Attribute;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::CSS$Attribute : public ::java::lang::Object
+{
+
+public: // actually package-private
+  CSS$Attribute(::java::lang::String *, jboolean, ::java::lang::String *);
+public:
+  ::java::lang::String * toString();
+  jboolean isInherited();
+  ::java::lang::String * getDefaultValue();
+  static ::javax::swing::text::html::CSS$Attribute * BACKGROUND;
+  static ::javax::swing::text::html::CSS$Attribute * BACKGROUND_ATTACHMENT;
+  static ::javax::swing::text::html::CSS$Attribute * BACKGROUND_COLOR;
+  static ::javax::swing::text::html::CSS$Attribute * BACKGROUND_IMAGE;
+  static ::javax::swing::text::html::CSS$Attribute * BACKGROUND_POSITION;
+  static ::javax::swing::text::html::CSS$Attribute * BACKGROUND_REPEAT;
+  static ::javax::swing::text::html::CSS$Attribute * BORDER;
+  static ::javax::swing::text::html::CSS$Attribute * BORDER_BOTTOM;
+  static ::javax::swing::text::html::CSS$Attribute * BORDER_BOTTOM_WIDTH;
+  static ::javax::swing::text::html::CSS$Attribute * BORDER_COLOR;
+  static ::javax::swing::text::html::CSS$Attribute * BORDER_LEFT;
+  static ::javax::swing::text::html::CSS$Attribute * BORDER_LEFT_WIDTH;
+  static ::javax::swing::text::html::CSS$Attribute * BORDER_RIGHT;
+  static ::javax::swing::text::html::CSS$Attribute * BORDER_RIGHT_WIDTH;
+  static ::javax::swing::text::html::CSS$Attribute * BORDER_STYLE;
+  static ::javax::swing::text::html::CSS$Attribute * BORDER_TOP;
+  static ::javax::swing::text::html::CSS$Attribute * BORDER_TOP_WIDTH;
+  static ::javax::swing::text::html::CSS$Attribute * BORDER_WIDTH;
+  static ::javax::swing::text::html::CSS$Attribute * CLEAR;
+  static ::javax::swing::text::html::CSS$Attribute * COLOR;
+  static ::javax::swing::text::html::CSS$Attribute * DISPLAY;
+  static ::javax::swing::text::html::CSS$Attribute * FLOAT;
+  static ::javax::swing::text::html::CSS$Attribute * FONT;
+  static ::javax::swing::text::html::CSS$Attribute * FONT_FAMILY;
+  static ::javax::swing::text::html::CSS$Attribute * FONT_SIZE;
+  static ::javax::swing::text::html::CSS$Attribute * FONT_STYLE;
+  static ::javax::swing::text::html::CSS$Attribute * FONT_VARIANT;
+  static ::javax::swing::text::html::CSS$Attribute * FONT_WEIGHT;
+  static ::javax::swing::text::html::CSS$Attribute * HEIGHT;
+  static ::javax::swing::text::html::CSS$Attribute * LETTER_SPACING;
+  static ::javax::swing::text::html::CSS$Attribute * LINE_HEIGHT;
+  static ::javax::swing::text::html::CSS$Attribute * LIST_STYLE;
+  static ::javax::swing::text::html::CSS$Attribute * LIST_STYLE_IMAGE;
+  static ::javax::swing::text::html::CSS$Attribute * LIST_STYLE_POSITION;
+  static ::javax::swing::text::html::CSS$Attribute * LIST_STYLE_TYPE;
+  static ::javax::swing::text::html::CSS$Attribute * MARGIN;
+  static ::javax::swing::text::html::CSS$Attribute * MARGIN_BOTTOM;
+  static ::javax::swing::text::html::CSS$Attribute * MARGIN_LEFT;
+  static ::javax::swing::text::html::CSS$Attribute * MARGIN_RIGHT;
+  static ::javax::swing::text::html::CSS$Attribute * MARGIN_TOP;
+  static ::javax::swing::text::html::CSS$Attribute * PADDING;
+  static ::javax::swing::text::html::CSS$Attribute * PADDING_BOTTOM;
+  static ::javax::swing::text::html::CSS$Attribute * PADDING_LEFT;
+  static ::javax::swing::text::html::CSS$Attribute * PADDING_RIGHT;
+  static ::javax::swing::text::html::CSS$Attribute * PADDING_TOP;
+  static ::javax::swing::text::html::CSS$Attribute * TEXT_ALIGN;
+  static ::javax::swing::text::html::CSS$Attribute * TEXT_DECORATION;
+  static ::javax::swing::text::html::CSS$Attribute * TEXT_INDENT;
+  static ::javax::swing::text::html::CSS$Attribute * TEXT_TRANSFORM;
+  static ::javax::swing::text::html::CSS$Attribute * VERTICAL_ALIGN;
+  static ::javax::swing::text::html::CSS$Attribute * WHITE_SPACE;
+  static ::javax::swing::text::html::CSS$Attribute * WIDTH;
+  static ::javax::swing::text::html::CSS$Attribute * WORD_SPACING;
+public: // actually package-private
+  static ::javax::swing::text::html::CSS$Attribute * BORDER_TOP_STYLE;
+  static ::javax::swing::text::html::CSS$Attribute * BORDER_BOTTOM_STYLE;
+  static ::javax::swing::text::html::CSS$Attribute * BORDER_LEFT_STYLE;
+  static ::javax::swing::text::html::CSS$Attribute * BORDER_RIGHT_STYLE;
+  static ::javax::swing::text::html::CSS$Attribute * BORDER_TOP_COLOR;
+  static ::javax::swing::text::html::CSS$Attribute * BORDER_BOTTOM_COLOR;
+  static ::javax::swing::text::html::CSS$Attribute * BORDER_LEFT_COLOR;
+  static ::javax::swing::text::html::CSS$Attribute * BORDER_RIGHT_COLOR;
+  static ::javax::swing::text::html::CSS$Attribute * BORDER_SPACING;
+  static ::javax::swing::text::html::CSS$Attribute * POSITION;
+  static ::javax::swing::text::html::CSS$Attribute * LEFT;
+  static ::javax::swing::text::html::CSS$Attribute * RIGHT;
+  static ::javax::swing::text::html::CSS$Attribute * TOP;
+  static ::javax::swing::text::html::CSS$Attribute * BOTTOM;
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) attStr;
+  jboolean isInherited__;
+  ::java::lang::String * defaultValue;
+  static ::java::util::HashMap * attributeMap;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_CSS$Attribute__
diff --git a/libjava/javax/swing/text/html/CSS.h b/libjava/javax/swing/text/html/CSS.h
new file mode 100644
index 000000000..1f3922db0
--- /dev/null
+++ b/libjava/javax/swing/text/html/CSS.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_CSS__
+#define __javax_swing_text_html_CSS__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class MutableAttributeSet;
+        namespace html
+        {
+            class CSS;
+            class CSS$Attribute;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::CSS : public ::java::lang::Object
+{
+
+public:
+  CSS();
+  static JArray< ::javax::swing::text::html::CSS$Attribute * > * getAllAttributeKeys();
+  static ::javax::swing::text::html::CSS$Attribute * getAttribute(::java::lang::String *);
+public: // actually package-private
+  static ::java::lang::Object * getValue(::javax::swing::text::html::CSS$Attribute *, ::java::lang::String *);
+  static void addInternal(::javax::swing::text::MutableAttributeSet *, ::javax::swing::text::html::CSS$Attribute *, ::java::lang::String *);
+private:
+  static void parseBackgroundShorthand(::javax::swing::text::MutableAttributeSet *, ::java::lang::String *);
+  static void parsePaddingShorthand(::javax::swing::text::MutableAttributeSet *, ::java::lang::String *);
+  static void parseMarginShorthand(::javax::swing::text::MutableAttributeSet *, ::java::lang::String *);
+  static void parseBorderShorthand(::javax::swing::text::MutableAttributeSet *, ::java::lang::String *, ::javax::swing::text::html::CSS$Attribute *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_CSS__
diff --git a/libjava/javax/swing/text/html/CSSBorder.h b/libjava/javax/swing/text/html/CSSBorder.h
new file mode 100644
index 000000000..aa836ff65
--- /dev/null
+++ b/libjava/javax/swing/text/html/CSSBorder.h
@@ -0,0 +1,90 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_CSSBorder__
+#define __javax_swing_text_html_CSSBorder__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Graphics;
+        class Insets;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AttributeSet;
+        namespace html
+        {
+            class CSS$Attribute;
+            class CSSBorder;
+            class StyleSheet;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::CSSBorder : public ::java::lang::Object
+{
+
+public: // actually package-private
+  CSSBorder(::javax::swing::text::AttributeSet *, ::javax::swing::text::html::StyleSheet *);
+private:
+  jint getBorderStyle(::javax::swing::text::AttributeSet *, ::javax::swing::text::html::CSS$Attribute *);
+  ::java::awt::Color * getBorderColor(::javax::swing::text::AttributeSet *, ::javax::swing::text::html::CSS$Attribute *);
+  jint getBorderWidth(::javax::swing::text::AttributeSet *, ::javax::swing::text::html::CSS$Attribute *, ::javax::swing::text::html::StyleSheet *);
+public:
+  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
+  virtual jboolean isBorderOpaque();
+  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
+private:
+  void paintBorderLine(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint, ::java::awt::Color *, jboolean);
+  void paintDottedLine(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::awt::Color *, jboolean);
+  void paintDashedLine(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::awt::Color *, jboolean);
+  void paintSolidLine(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::awt::Color *, jboolean);
+  void paintDoubleLine(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::awt::Color *, jboolean);
+  void paintGrooveLine(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::awt::Color *, jboolean);
+  void paintRidgeLine(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::awt::Color *, jboolean);
+  void paintOutsetLine(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::awt::Color *, jboolean);
+  void paintInsetLine(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::awt::Color *, jboolean);
+  static const jint STYLE_NOT_SET = -1;
+  static const jint STYLE_NONE = 0;
+  static const jint STYLE_HIDDEN = 1;
+  static const jint STYLE_DOTTED = 2;
+  static const jint STYLE_DASHED = 3;
+  static const jint STYLE_SOLID = 4;
+  static const jint STYLE_DOUBLE = 5;
+  static const jint STYLE_GROOVE = 6;
+  static const jint STYLE_RIDGE = 7;
+  static const jint STYLE_INSET = 8;
+  static const jint STYLE_OUTSET = 9;
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) left;
+  jint right;
+  jint top;
+  jint bottom;
+  jint leftStyle;
+  jint rightStyle;
+  jint topStyle;
+  ::java::awt::Color * topColor;
+  ::java::awt::Color * bottomColor;
+  ::java::awt::Color * leftColor;
+  ::java::awt::Color * rightColor;
+  jint bottomStyle;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_CSSBorder__
diff --git a/libjava/javax/swing/text/html/CSSParser$CSSParserCallback.h b/libjava/javax/swing/text/html/CSSParser$CSSParserCallback.h
new file mode 100644
index 000000000..a2bb66228
--- /dev/null
+++ b/libjava/javax/swing/text/html/CSSParser$CSSParserCallback.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_CSSParser$CSSParserCallback__
+#define __javax_swing_text_html_CSSParser$CSSParserCallback__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace html
+        {
+            class CSSParser$CSSParserCallback;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::CSSParser$CSSParserCallback : public ::java::lang::Object
+{
+
+public:
+  virtual void handleImport(::java::lang::String *) = 0;
+  virtual void startRule() = 0;
+  virtual void endRule() = 0;
+  virtual void handleSelector(::java::lang::String *) = 0;
+  virtual void handleProperty(::java::lang::String *) = 0;
+  virtual void handleValue(::java::lang::String *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_text_html_CSSParser$CSSParserCallback__
diff --git a/libjava/javax/swing/text/html/CSSParser.h b/libjava/javax/swing/text/html/CSSParser.h
new file mode 100644
index 000000000..83cda4f2d
--- /dev/null
+++ b/libjava/javax/swing/text/html/CSSParser.h
@@ -0,0 +1,81 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_CSSParser__
+#define __javax_swing_text_html_CSSParser__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace html
+        {
+            class CSSParser;
+            class CSSParser$CSSParserCallback;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::CSSParser : public ::java::lang::Object
+{
+
+public: // actually package-private
+  CSSParser();
+private:
+  void append(jchar);
+  jint nextToken(jchar);
+  jint readChar();
+public: // actually package-private
+  virtual void parse(::java::io::Reader *, ::javax::swing::text::html::CSSParser$CSSParserCallback *, jboolean);
+private:
+  jint readWS();
+  jboolean getNextStatement();
+  void parseAtRule();
+  void parseRuleSet();
+  jboolean parseSelectors();
+  void parseDeclarationBlock();
+  jint parseDeclaration();
+  jint parseIdentifiers(jchar, jboolean);
+  void parseTillClosed(jint);
+  jboolean getIdentifier(jchar);
+  void readTill(jchar);
+  void readComment();
+  void startBlock(jint);
+  void endBlock(jint);
+  jboolean inBlock();
+  void pushChar(jint);
+  static const jint IDENTIFIER = 1;
+  static const jint BRACKET_OPEN = 2;
+  static const jint BRACKET_CLOSE = 3;
+  static const jint BRACE_OPEN = 4;
+  static const jint BRACE_CLOSE = 5;
+  static const jint PAREN_OPEN = 6;
+  static const jint PAREN_CLOSE = 7;
+  static const jint END = -1;
+  static JArray< jchar > * charMapping;
+  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) didPushChar;
+  jint pushedChar;
+  JArray< jint > * unitStack;
+  jint stackCount;
+  ::java::io::Reader * reader;
+  jboolean encounteredRuleSet;
+  ::javax::swing::text::html::CSSParser$CSSParserCallback * callback;
+  JArray< jchar > * tokenBuffer;
+  jint tokenBufferLength;
+  jboolean readWS__;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_CSSParser__
diff --git a/libjava/javax/swing/text/html/FormSubmitEvent$MethodType.h b/libjava/javax/swing/text/html/FormSubmitEvent$MethodType.h
new file mode 100644
index 000000000..99fbed04d
--- /dev/null
+++ b/libjava/javax/swing/text/html/FormSubmitEvent$MethodType.h
@@ -0,0 +1,37 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_FormSubmitEvent$MethodType__
+#define __javax_swing_text_html_FormSubmitEvent$MethodType__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace html
+        {
+            class FormSubmitEvent$MethodType;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::FormSubmitEvent$MethodType : public ::java::lang::Object
+{
+
+  FormSubmitEvent$MethodType();
+public:
+  static ::javax::swing::text::html::FormSubmitEvent$MethodType * POST;
+  static ::javax::swing::text::html::FormSubmitEvent$MethodType * GET;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_FormSubmitEvent$MethodType__
diff --git a/libjava/javax/swing/text/html/FormSubmitEvent.h b/libjava/javax/swing/text/html/FormSubmitEvent.h
new file mode 100644
index 000000000..7908376d1
--- /dev/null
+++ b/libjava/javax/swing/text/html/FormSubmitEvent.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_FormSubmitEvent__
+#define __javax_swing_text_html_FormSubmitEvent__
+
+#pragma interface
+
+#include <javax/swing/text/html/HTMLFrameHyperlinkEvent.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace net
+    {
+        class URL;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class HyperlinkEvent$EventType;
+      }
+      namespace text
+      {
+          class Element;
+        namespace html
+        {
+            class FormSubmitEvent;
+            class FormSubmitEvent$MethodType;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::FormSubmitEvent : public ::javax::swing::text::html::HTMLFrameHyperlinkEvent
+{
+
+public: // actually package-private
+  FormSubmitEvent(::java::lang::Object *, ::javax::swing::event::HyperlinkEvent$EventType *, ::java::net::URL *, ::javax::swing::text::Element *, ::java::lang::String *, ::javax::swing::text::html::FormSubmitEvent$MethodType *, ::java::lang::String *);
+public:
+  virtual ::java::lang::String * getData();
+  virtual ::javax::swing::text::html::FormSubmitEvent$MethodType * getMethod();
+private:
+  ::javax::swing::text::html::FormSubmitEvent$MethodType * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLFrameHyperlinkEvent)))) method;
+  ::java::lang::String * data;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_FormSubmitEvent__
diff --git a/libjava/javax/swing/text/html/FormView$1.h b/libjava/javax/swing/text/html/FormView$1.h
new file mode 100644
index 000000000..99a5627f1
--- /dev/null
+++ b/libjava/javax/swing/text/html/FormView$1.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_FormView$1__
+#define __javax_swing_text_html_FormView$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace net
+    {
+        class URL;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JEditorPane;
+      namespace text
+      {
+        namespace html
+        {
+            class FormView$1;
+            class FormView$SubmitThread;
+            class HTMLDocument;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::FormView$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  FormView$1(::javax::swing::text::html::FormView$SubmitThread *, ::javax::swing::text::html::HTMLDocument *, ::javax::swing::JEditorPane *, ::java::lang::String *, ::java::net::URL *, ::java::lang::String *, ::java::net::URL *);
+public:
+  virtual void run();
+public: // actually package-private
+  ::javax::swing::text::html::FormView$SubmitThread * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
+private:
+  ::javax::swing::text::html::HTMLDocument * val$doc;
+  ::javax::swing::JEditorPane * val$editor;
+  ::java::lang::String * val$method;
+  ::java::net::URL * val$actionURL;
+  ::java::lang::String * val$target;
+  ::java::net::URL * val$url;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_FormView$1__
diff --git a/libjava/javax/swing/text/html/FormView$MouseEventListener.h b/libjava/javax/swing/text/html/FormView$MouseEventListener.h
new file mode 100644
index 000000000..d602e6449
--- /dev/null
+++ b/libjava/javax/swing/text/html/FormView$MouseEventListener.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_FormView$MouseEventListener__
+#define __javax_swing_text_html_FormView$MouseEventListener__
+
+#pragma interface
+
+#include <java/awt/event/MouseAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace html
+        {
+            class FormView;
+            class FormView$MouseEventListener;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::FormView$MouseEventListener : public ::java::awt::event::MouseAdapter
+{
+
+public: // actually protected
+  FormView$MouseEventListener(::javax::swing::text::html::FormView *);
+public:
+  virtual void mouseReleased(::java::awt::event::MouseEvent *);
+public: // actually package-private
+  ::javax::swing::text::html::FormView * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_FormView$MouseEventListener__
diff --git a/libjava/javax/swing/text/html/FormView$SubmitThread.h b/libjava/javax/swing/text/html/FormView$SubmitThread.h
new file mode 100644
index 000000000..69a01bbe7
--- /dev/null
+++ b/libjava/javax/swing/text/html/FormView$SubmitThread.h
@@ -0,0 +1,61 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_FormView$SubmitThread__
+#define __javax_swing_text_html_FormView$SubmitThread__
+
+#pragma interface
+
+#include <java/lang/Thread.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace net
+    {
+        class URL;
+        class URLConnection;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AttributeSet;
+        namespace html
+        {
+            class FormSubmitEvent;
+            class FormView;
+            class FormView$SubmitThread;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::FormView$SubmitThread : public ::java::lang::Thread
+{
+
+public: // actually package-private
+  FormView$SubmitThread(::javax::swing::text::html::FormView *, ::java::lang::String *);
+public:
+  virtual void run();
+private:
+  ::java::lang::String * getMethod();
+  ::java::net::URL * getActionURL();
+  ::java::lang::String * getTarget();
+  void postData(::java::net::URLConnection *, ::java::lang::String *);
+  ::javax::swing::text::AttributeSet * getFormAttributes();
+public: // actually package-private
+  virtual ::javax::swing::text::html::FormSubmitEvent * createSubmitEvent(::java::lang::String *, ::java::net::URL *, ::java::lang::String *);
+private:
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) data;
+public: // actually package-private
+  ::javax::swing::text::html::FormView * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_FormView$SubmitThread__
diff --git a/libjava/javax/swing/text/html/FormView.h b/libjava/javax/swing/text/html/FormView.h
new file mode 100644
index 000000000..fff2e6309
--- /dev/null
+++ b/libjava/javax/swing/text/html/FormView.h
@@ -0,0 +1,76 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_FormView__
+#define __javax_swing_text_html_FormView__
+
+#pragma interface
+
+#include <javax/swing/text/ComponentView.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+        class Point;
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AttributeSet;
+          class Element;
+        namespace html
+        {
+            class FormView;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::FormView : public ::javax::swing::text::ComponentView
+{
+
+public:
+  FormView(::javax::swing::text::Element *);
+public: // actually protected
+  virtual ::java::awt::Component * createComponent();
+public:
+  virtual jfloat getMaximumSpan(jint);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually protected
+  virtual void submitData(::java::lang::String *);
+  virtual void imageSubmit(::java::lang::String *);
+public: // actually package-private
+  virtual ::java::lang::String * getImageData(::java::awt::Point *);
+  virtual ::javax::swing::text::Element * getFormElement();
+private:
+  ::java::lang::String * getFormData();
+  void getElementFormData(::javax::swing::text::Element *, ::java::lang::StringBuilder *);
+  void getSelectData(::javax::swing::text::AttributeSet *, ::java::lang::StringBuilder *);
+  ::java::lang::String * getTextAreaData(::javax::swing::text::AttributeSet *);
+  ::java::lang::String * getInputFormData(::javax::swing::text::AttributeSet *);
+  void addData(::java::lang::StringBuilder *, ::java::lang::String *, ::java::lang::String *);
+  void resetForm();
+public:
+  static ::java::lang::String * SUBMIT;
+  static ::java::lang::String * RESET;
+private:
+  jboolean __attribute__((aligned(__alignof__( ::javax::swing::text::ComponentView)))) maxIsPreferred;
+public: // actually package-private
+  static jboolean $assertionsDisabled;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_FormView__
diff --git a/libjava/javax/swing/text/html/FrameSetView$FrameSetRow.h b/libjava/javax/swing/text/html/FrameSetView$FrameSetRow.h
new file mode 100644
index 000000000..ae59240ac
--- /dev/null
+++ b/libjava/javax/swing/text/html/FrameSetView$FrameSetRow.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_FrameSetView$FrameSetRow__
+#define __javax_swing_text_html_FrameSetView$FrameSetRow__
+
+#pragma interface
+
+#include <javax/swing/text/BoxView.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Element;
+          class ViewFactory;
+        namespace html
+        {
+            class FrameSetView;
+            class FrameSetView$FrameSetRow;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::FrameSetView$FrameSetRow : public ::javax::swing::text::BoxView
+{
+
+public: // actually package-private
+  FrameSetView$FrameSetRow(::javax::swing::text::html::FrameSetView *, ::javax::swing::text::Element *, jint);
+public: // actually protected
+  virtual void loadChildren(::javax::swing::text::ViewFactory *);
+  virtual void layoutMajorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
+private:
+  jint __attribute__((aligned(__alignof__( ::javax::swing::text::BoxView)))) row;
+public: // actually package-private
+  ::javax::swing::text::html::FrameSetView * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_FrameSetView$FrameSetRow__
diff --git a/libjava/javax/swing/text/html/FrameSetView.h b/libjava/javax/swing/text/html/FrameSetView.h
new file mode 100644
index 000000000..a31abb1ca
--- /dev/null
+++ b/libjava/javax/swing/text/html/FrameSetView.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_FrameSetView__
+#define __javax_swing_text_html_FrameSetView__
+
+#pragma interface
+
+#include <javax/swing/text/BoxView.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Element;
+          class ViewFactory;
+        namespace html
+        {
+            class FrameSetView;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::FrameSetView : public ::javax::swing::text::BoxView
+{
+
+public: // actually package-private
+  FrameSetView(::javax::swing::text::Element *);
+public: // actually protected
+  virtual void loadChildren(::javax::swing::text::ViewFactory *);
+private:
+  void parseRowsCols();
+  void parseLayout(::java::lang::String *, jint);
+public: // actually protected
+  virtual void layoutMajorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
+public: // actually package-private
+  virtual void layoutViews(jint, jint, JArray< jint > *, JArray< jint > *, jint, JArray< jint > *, JArray< jint > *, JArray< jint > *);
+  JArray< JArray< jint > * > * __attribute__((aligned(__alignof__( ::javax::swing::text::BoxView)))) absolute;
+  JArray< JArray< jint > * > * relative;
+  JArray< JArray< jint > * > * percent;
+  JArray< jint > * numViews;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_FrameSetView__
diff --git a/libjava/javax/swing/text/html/FrameView.h b/libjava/javax/swing/text/html/FrameView.h
new file mode 100644
index 000000000..e1856e327
--- /dev/null
+++ b/libjava/javax/swing/text/html/FrameView.h
@@ -0,0 +1,58 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_FrameView__
+#define __javax_swing_text_html_FrameView__
+
+#pragma interface
+
+#include <javax/swing/text/ComponentView.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JEditorPane;
+      namespace event
+      {
+          class HyperlinkEvent;
+      }
+      namespace text
+      {
+          class Element;
+        namespace html
+        {
+            class FrameView;
+            class HTMLFrameHyperlinkEvent;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::FrameView : public ::javax::swing::text::ComponentView
+{
+
+public: // actually package-private
+  FrameView(::javax::swing::text::Element *);
+public: // actually protected
+  virtual ::java::awt::Component * createComponent();
+public:
+  virtual void hyperlinkUpdate(::javax::swing::event::HyperlinkEvent *);
+private:
+  void handleHyperlinkEvent(::javax::swing::event::HyperlinkEvent *, ::javax::swing::JEditorPane *, ::java::lang::String *);
+  void handleFormSubmitEvent(::javax::swing::text::html::HTMLFrameHyperlinkEvent *, ::javax::swing::JEditorPane *, ::java::lang::String *);
+  ::javax::swing::JEditorPane * getTopEditorPane();
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_FrameView__
diff --git a/libjava/javax/swing/text/html/HRuleView$Beginning.h b/libjava/javax/swing/text/html/HRuleView$Beginning.h
new file mode 100644
index 000000000..a1c6e1dc8
--- /dev/null
+++ b/libjava/javax/swing/text/html/HRuleView$Beginning.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HRuleView$Beginning__
+#define __javax_swing_text_html_HRuleView$Beginning__
+
+#pragma interface
+
+#include <javax/swing/text/html/NullView.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Element;
+        namespace html
+        {
+            class HRuleView;
+            class HRuleView$Beginning;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HRuleView$Beginning : public ::javax::swing::text::html::NullView
+{
+
+public:
+  virtual jint getEndOffset();
+  virtual jint getStartOffset();
+  HRuleView$Beginning(::javax::swing::text::html::HRuleView *, ::javax::swing::text::Element *, jint);
+public: // actually package-private
+  jint __attribute__((aligned(__alignof__( ::javax::swing::text::html::NullView)))) breakOffset;
+  ::javax::swing::text::html::HRuleView * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HRuleView$Beginning__
diff --git a/libjava/javax/swing/text/html/HRuleView.h b/libjava/javax/swing/text/html/HRuleView.h
new file mode 100644
index 000000000..f028b51ae
--- /dev/null
+++ b/libjava/javax/swing/text/html/HRuleView.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HRuleView__
+#define __javax_swing_text_html_HRuleView__
+
+#pragma interface
+
+#include <javax/swing/text/html/InlineView.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Element;
+          class View;
+        namespace html
+        {
+            class HRuleView;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HRuleView : public ::javax::swing::text::html::InlineView
+{
+
+public:
+  HRuleView(::javax::swing::text::Element *);
+  virtual jint getBreakWeight(jint, jfloat, jfloat);
+  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
+  virtual ::javax::swing::text::View * breakView(jint, jint, jfloat, jfloat);
+  virtual jfloat getMaximumSpan(jint);
+  virtual jfloat getPreferredSpan(jint);
+public: // actually package-private
+  ::javax::swing::text::View * __attribute__((aligned(__alignof__( ::javax::swing::text::html::InlineView)))) nullView;
+  static jint HEIGHT;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HRuleView__
diff --git a/libjava/javax/swing/text/html/HTML$Attribute.h b/libjava/javax/swing/text/html/HTML$Attribute.h
new file mode 100644
index 000000000..47868d02d
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTML$Attribute.h
@@ -0,0 +1,130 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTML$Attribute__
+#define __javax_swing_text_html_HTML$Attribute__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace html
+        {
+            class HTML$Attribute;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTML$Attribute : public ::java::lang::Object
+{
+
+  HTML$Attribute(::java::lang::String *);
+public:
+  ::java::lang::String * toString();
+public: // actually package-private
+  static JArray< ::javax::swing::text::html::HTML$Attribute * > * getAllAttributes();
+public:
+  static ::javax::swing::text::html::HTML$Attribute * ACTION;
+  static ::javax::swing::text::html::HTML$Attribute * ALIGN;
+  static ::javax::swing::text::html::HTML$Attribute * ALINK;
+  static ::javax::swing::text::html::HTML$Attribute * ALT;
+  static ::javax::swing::text::html::HTML$Attribute * ARCHIVE;
+  static ::javax::swing::text::html::HTML$Attribute * BACKGROUND;
+  static ::javax::swing::text::html::HTML$Attribute * BGCOLOR;
+  static ::javax::swing::text::html::HTML$Attribute * BORDER;
+  static ::javax::swing::text::html::HTML$Attribute * CELLPADDING;
+  static ::javax::swing::text::html::HTML$Attribute * CELLSPACING;
+  static ::javax::swing::text::html::HTML$Attribute * CHECKED;
+  static ::javax::swing::text::html::HTML$Attribute * CLASS;
+  static ::javax::swing::text::html::HTML$Attribute * CLASSID;
+  static ::javax::swing::text::html::HTML$Attribute * CLEAR;
+  static ::javax::swing::text::html::HTML$Attribute * CODE;
+  static ::javax::swing::text::html::HTML$Attribute * CODEBASE;
+  static ::javax::swing::text::html::HTML$Attribute * CODETYPE;
+  static ::javax::swing::text::html::HTML$Attribute * COLOR;
+  static ::javax::swing::text::html::HTML$Attribute * COLS;
+  static ::javax::swing::text::html::HTML$Attribute * COLSPAN;
+  static ::javax::swing::text::html::HTML$Attribute * COMMENT;
+  static ::javax::swing::text::html::HTML$Attribute * COMPACT;
+  static ::javax::swing::text::html::HTML$Attribute * CONTENT;
+  static ::javax::swing::text::html::HTML$Attribute * COORDS;
+  static ::javax::swing::text::html::HTML$Attribute * DATA;
+  static ::javax::swing::text::html::HTML$Attribute * DECLARE;
+  static ::javax::swing::text::html::HTML$Attribute * DIR;
+  static ::javax::swing::text::html::HTML$Attribute * DUMMY;
+  static ::javax::swing::text::html::HTML$Attribute * ENCTYPE;
+  static ::javax::swing::text::html::HTML$Attribute * ENDTAG;
+  static ::javax::swing::text::html::HTML$Attribute * FACE;
+  static ::javax::swing::text::html::HTML$Attribute * FRAMEBORDER;
+  static ::javax::swing::text::html::HTML$Attribute * HALIGN;
+  static ::javax::swing::text::html::HTML$Attribute * HEIGHT;
+  static ::javax::swing::text::html::HTML$Attribute * HREF;
+  static ::javax::swing::text::html::HTML$Attribute * HSPACE;
+  static ::javax::swing::text::html::HTML$Attribute * HTTPEQUIV;
+  static ::javax::swing::text::html::HTML$Attribute * ID;
+  static ::javax::swing::text::html::HTML$Attribute * ISMAP;
+  static ::javax::swing::text::html::HTML$Attribute * LANG;
+  static ::javax::swing::text::html::HTML$Attribute * LANGUAGE;
+  static ::javax::swing::text::html::HTML$Attribute * LINK;
+  static ::javax::swing::text::html::HTML$Attribute * LOWSRC;
+  static ::javax::swing::text::html::HTML$Attribute * MARGINHEIGHT;
+  static ::javax::swing::text::html::HTML$Attribute * MARGINWIDTH;
+  static ::javax::swing::text::html::HTML$Attribute * MAXLENGTH;
+public: // actually package-private
+  static ::javax::swing::text::html::HTML$Attribute * MEDIA;
+public:
+  static ::javax::swing::text::html::HTML$Attribute * METHOD;
+  static ::javax::swing::text::html::HTML$Attribute * MULTIPLE;
+  static ::javax::swing::text::html::HTML$Attribute * N;
+  static ::javax::swing::text::html::HTML$Attribute * NAME;
+  static ::javax::swing::text::html::HTML$Attribute * NOHREF;
+  static ::javax::swing::text::html::HTML$Attribute * NORESIZE;
+  static ::javax::swing::text::html::HTML$Attribute * NOSHADE;
+  static ::javax::swing::text::html::HTML$Attribute * NOWRAP;
+  static ::javax::swing::text::html::HTML$Attribute * PROMPT;
+  static ::javax::swing::text::html::HTML$Attribute * REL;
+  static ::javax::swing::text::html::HTML$Attribute * REV;
+  static ::javax::swing::text::html::HTML$Attribute * ROWS;
+  static ::javax::swing::text::html::HTML$Attribute * ROWSPAN;
+  static ::javax::swing::text::html::HTML$Attribute * SCROLLING;
+  static ::javax::swing::text::html::HTML$Attribute * SELECTED;
+  static ::javax::swing::text::html::HTML$Attribute * SHAPE;
+  static ::javax::swing::text::html::HTML$Attribute * SHAPES;
+  static ::javax::swing::text::html::HTML$Attribute * SIZE;
+  static ::javax::swing::text::html::HTML$Attribute * SRC;
+  static ::javax::swing::text::html::HTML$Attribute * STANDBY;
+  static ::javax::swing::text::html::HTML$Attribute * START;
+  static ::javax::swing::text::html::HTML$Attribute * STYLE;
+  static ::javax::swing::text::html::HTML$Attribute * TARGET;
+  static ::javax::swing::text::html::HTML$Attribute * TEXT;
+  static ::javax::swing::text::html::HTML$Attribute * TITLE;
+  static ::javax::swing::text::html::HTML$Attribute * TYPE;
+  static ::javax::swing::text::html::HTML$Attribute * USEMAP;
+  static ::javax::swing::text::html::HTML$Attribute * VALIGN;
+  static ::javax::swing::text::html::HTML$Attribute * VALUE;
+  static ::javax::swing::text::html::HTML$Attribute * VALUETYPE;
+  static ::javax::swing::text::html::HTML$Attribute * VERSION;
+  static ::javax::swing::text::html::HTML$Attribute * VLINK;
+  static ::javax::swing::text::html::HTML$Attribute * VSPACE;
+  static ::javax::swing::text::html::HTML$Attribute * WIDTH;
+public: // actually package-private
+  static ::javax::swing::text::html::HTML$Attribute * PSEUDO_CLASS;
+  static ::javax::swing::text::html::HTML$Attribute * DYNAMIC_CLASS;
+private:
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTML$Attribute__
diff --git a/libjava/javax/swing/text/html/HTML$Tag.h b/libjava/javax/swing/text/html/HTML$Tag.h
new file mode 100644
index 000000000..2dd2dceba
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTML$Tag.h
@@ -0,0 +1,139 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTML$Tag__
+#define __javax_swing_text_html_HTML$Tag__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace html
+        {
+            class HTML$Tag;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTML$Tag : public ::java::lang::Object
+{
+
+public:
+  HTML$Tag();
+public: // actually protected
+  HTML$Tag(::java::lang::String *);
+  HTML$Tag(::java::lang::String *, jboolean, jboolean);
+public: // actually package-private
+  HTML$Tag(::java::lang::String *, jint);
+public:
+  virtual jboolean isBlock();
+  virtual jboolean isPreformatted();
+  virtual jboolean breaksFlow();
+  virtual ::java::lang::String * toString();
+public: // actually package-private
+  static JArray< ::javax::swing::text::html::HTML$Tag * > * getAllTags();
+  virtual jboolean isSyntetic();
+private:
+  static void unexpected(::java::lang::Exception *);
+public:
+  static ::javax::swing::text::html::HTML$Tag * A;
+  static ::javax::swing::text::html::HTML$Tag * ADDRESS;
+  static ::javax::swing::text::html::HTML$Tag * APPLET;
+  static ::javax::swing::text::html::HTML$Tag * AREA;
+  static ::javax::swing::text::html::HTML$Tag * B;
+  static ::javax::swing::text::html::HTML$Tag * BASE;
+  static ::javax::swing::text::html::HTML$Tag * BASEFONT;
+  static ::javax::swing::text::html::HTML$Tag * BIG;
+  static ::javax::swing::text::html::HTML$Tag * BLOCKQUOTE;
+  static ::javax::swing::text::html::HTML$Tag * BODY;
+  static ::javax::swing::text::html::HTML$Tag * BR;
+  static ::javax::swing::text::html::HTML$Tag * CAPTION;
+  static ::javax::swing::text::html::HTML$Tag * CENTER;
+  static ::javax::swing::text::html::HTML$Tag * CITE;
+  static ::javax::swing::text::html::HTML$Tag * CODE;
+  static ::javax::swing::text::html::HTML$Tag * DD;
+  static ::javax::swing::text::html::HTML$Tag * DFN;
+  static ::javax::swing::text::html::HTML$Tag * DIR;
+  static ::javax::swing::text::html::HTML$Tag * DIV;
+  static ::javax::swing::text::html::HTML$Tag * DL;
+  static ::javax::swing::text::html::HTML$Tag * DT;
+  static ::javax::swing::text::html::HTML$Tag * EM;
+  static ::javax::swing::text::html::HTML$Tag * FONT;
+  static ::javax::swing::text::html::HTML$Tag * FORM;
+  static ::javax::swing::text::html::HTML$Tag * FRAME;
+  static ::javax::swing::text::html::HTML$Tag * FRAMESET;
+  static ::javax::swing::text::html::HTML$Tag * H1;
+  static ::javax::swing::text::html::HTML$Tag * H2;
+  static ::javax::swing::text::html::HTML$Tag * H3;
+  static ::javax::swing::text::html::HTML$Tag * H4;
+  static ::javax::swing::text::html::HTML$Tag * H5;
+  static ::javax::swing::text::html::HTML$Tag * H6;
+  static ::javax::swing::text::html::HTML$Tag * HEAD;
+  static ::javax::swing::text::html::HTML$Tag * HR;
+  static ::javax::swing::text::html::HTML$Tag * HTML;
+  static ::javax::swing::text::html::HTML$Tag * I;
+  static ::javax::swing::text::html::HTML$Tag * IMG;
+  static ::javax::swing::text::html::HTML$Tag * INPUT;
+  static ::javax::swing::text::html::HTML$Tag * ISINDEX;
+  static ::javax::swing::text::html::HTML$Tag * KBD;
+  static ::javax::swing::text::html::HTML$Tag * LI;
+  static ::javax::swing::text::html::HTML$Tag * LINK;
+  static ::javax::swing::text::html::HTML$Tag * MAP;
+  static ::javax::swing::text::html::HTML$Tag * MENU;
+  static ::javax::swing::text::html::HTML$Tag * META;
+public: // actually package-private
+  static ::javax::swing::text::html::HTML$Tag * NOBR;
+public:
+  static ::javax::swing::text::html::HTML$Tag * NOFRAMES;
+  static ::javax::swing::text::html::HTML$Tag * OBJECT;
+  static ::javax::swing::text::html::HTML$Tag * OL;
+  static ::javax::swing::text::html::HTML$Tag * OPTION;
+  static ::javax::swing::text::html::HTML$Tag * P;
+  static ::javax::swing::text::html::HTML$Tag * PARAM;
+  static ::javax::swing::text::html::HTML$Tag * PRE;
+  static ::javax::swing::text::html::HTML$Tag * S;
+  static ::javax::swing::text::html::HTML$Tag * SAMP;
+  static ::javax::swing::text::html::HTML$Tag * SCRIPT;
+  static ::javax::swing::text::html::HTML$Tag * SELECT;
+  static ::javax::swing::text::html::HTML$Tag * SMALL;
+  static ::javax::swing::text::html::HTML$Tag * SPAN;
+  static ::javax::swing::text::html::HTML$Tag * STRIKE;
+  static ::javax::swing::text::html::HTML$Tag * STRONG;
+  static ::javax::swing::text::html::HTML$Tag * STYLE;
+  static ::javax::swing::text::html::HTML$Tag * SUB;
+  static ::javax::swing::text::html::HTML$Tag * SUP;
+  static ::javax::swing::text::html::HTML$Tag * TABLE;
+  static ::javax::swing::text::html::HTML$Tag * TD;
+  static ::javax::swing::text::html::HTML$Tag * TEXTAREA;
+  static ::javax::swing::text::html::HTML$Tag * TH;
+  static ::javax::swing::text::html::HTML$Tag * TITLE;
+  static ::javax::swing::text::html::HTML$Tag * TR;
+  static ::javax::swing::text::html::HTML$Tag * TT;
+  static ::javax::swing::text::html::HTML$Tag * U;
+  static ::javax::swing::text::html::HTML$Tag * UL;
+  static ::javax::swing::text::html::HTML$Tag * VAR;
+private:
+  static const jint TOTAL_SYNTHETIC_TAGS = 3;
+public:
+  static ::javax::swing::text::html::HTML$Tag * COMMENT;
+  static ::javax::swing::text::html::HTML$Tag * CONTENT;
+  static ::javax::swing::text::html::HTML$Tag * IMPLIED;
+public: // actually package-private
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
+  jint flags;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTML$Tag__
diff --git a/libjava/javax/swing/text/html/HTML$UnknownTag.h b/libjava/javax/swing/text/html/HTML$UnknownTag.h
new file mode 100644
index 000000000..e499c01cc
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTML$UnknownTag.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTML$UnknownTag__
+#define __javax_swing_text_html_HTML$UnknownTag__
+
+#pragma interface
+
+#include <javax/swing/text/html/HTML$Tag.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace html
+        {
+            class HTML$UnknownTag;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTML$UnknownTag : public ::javax::swing::text::html::HTML$Tag
+{
+
+public:
+  HTML$UnknownTag(::java::lang::String *);
+private:
+  static const jlong serialVersionUID = -1534369342247250625LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTML$UnknownTag__
diff --git a/libjava/javax/swing/text/html/HTML.h b/libjava/javax/swing/text/html/HTML.h
new file mode 100644
index 000000000..84dd640ed
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTML.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTML__
+#define __javax_swing_text_html_HTML__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AttributeSet;
+        namespace html
+        {
+            class HTML;
+            class HTML$Attribute;
+            class HTML$Tag;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTML : public ::java::lang::Object
+{
+
+public:
+  HTML();
+  static JArray< ::javax::swing::text::html::HTML$Attribute * > * getAllAttributeKeys();
+  static JArray< ::javax::swing::text::html::HTML$Tag * > * getAllTags();
+  static ::javax::swing::text::html::HTML$Attribute * getAttributeKey(::java::lang::String *);
+  static jint getIntegerAttributeValue(::javax::swing::text::AttributeSet *, ::javax::swing::text::html::HTML$Attribute *, jint);
+  static ::javax::swing::text::html::HTML$Tag * getTag(::java::lang::String *);
+  static ::java::lang::String * NULL_ATTRIBUTE_VALUE;
+public: // actually package-private
+  static const jint BREAKS = 1;
+  static const jint BLOCK = 2;
+  static const jint PREFORMATTED = 4;
+  static const jint SYNTHETIC = 8;
+private:
+  static ::java::util::Map * tagMap;
+  static ::java::util::Map * attrMap;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTML__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$1.h b/libjava/javax/swing/text/html/HTMLDocument$1.h
new file mode 100644
index 000000000..1c65c109a
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTMLDocument$1.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTMLDocument$1__
+#define __javax_swing_text_html_HTMLDocument$1__
+
+#pragma interface
+
+#include <javax/swing/text/html/HTMLDocument$HTMLReader.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class MutableAttributeSet;
+        namespace html
+        {
+            class HTML$Tag;
+            class HTMLDocument;
+            class HTMLDocument$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTMLDocument$1 : public ::javax::swing::text::html::HTMLDocument$HTMLReader
+{
+
+public: // actually package-private
+  HTMLDocument$1(::javax::swing::text::html::HTMLDocument *, jint, jint, jint, ::javax::swing::text::html::HTML$Tag *);
+public:
+  virtual void handleStartTag(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *, jint);
+  virtual void handleEndTag(::javax::swing::text::html::HTML$Tag *, jint);
+public: // actually package-private
+  ::javax::swing::text::html::HTMLDocument * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTMLDocument$1__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$BlockElement.h b/libjava/javax/swing/text/html/HTMLDocument$BlockElement.h
new file mode 100644
index 000000000..efcaa223b
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTMLDocument$BlockElement.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTMLDocument$BlockElement__
+#define __javax_swing_text_html_HTMLDocument$BlockElement__
+
+#pragma interface
+
+#include <javax/swing/text/AbstractDocument$BranchElement.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AttributeSet;
+          class Element;
+        namespace html
+        {
+            class HTMLDocument;
+            class HTMLDocument$BlockElement;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTMLDocument$BlockElement : public ::javax::swing::text::AbstractDocument$BranchElement
+{
+
+public:
+  HTMLDocument$BlockElement(::javax::swing::text::html::HTMLDocument *, ::javax::swing::text::Element *, ::javax::swing::text::AttributeSet *);
+  virtual ::javax::swing::text::AttributeSet * getResolveParent();
+  virtual ::java::lang::String * getName();
+public: // actually package-private
+  ::javax::swing::text::html::HTMLDocument * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractDocument$BranchElement)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTMLDocument$BlockElement__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$AreaAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$AreaAction.h
new file mode 100644
index 000000000..0a6bd0daa
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$AreaAction.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$AreaAction__
+#define __javax_swing_text_html_HTMLDocument$HTMLReader$AreaAction__
+
+#pragma interface
+
+#include <javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class MutableAttributeSet;
+        namespace html
+        {
+            class HTML$Tag;
+            class HTMLDocument$HTMLReader;
+            class HTMLDocument$HTMLReader$AreaAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTMLDocument$HTMLReader$AreaAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction
+{
+
+public: // actually package-private
+  HTMLDocument$HTMLReader$AreaAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
+public:
+  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
+  virtual void end(::javax::swing::text::html::HTML$Tag *);
+public: // actually package-private
+  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$AreaAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$BaseAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$BaseAction.h
new file mode 100644
index 000000000..61e8e5385
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$BaseAction.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$BaseAction__
+#define __javax_swing_text_html_HTMLDocument$HTMLReader$BaseAction__
+
+#pragma interface
+
+#include <javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class MutableAttributeSet;
+        namespace html
+        {
+            class HTML$Tag;
+            class HTMLDocument$HTMLReader;
+            class HTMLDocument$HTMLReader$BaseAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTMLDocument$HTMLReader$BaseAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction
+{
+
+public: // actually package-private
+  HTMLDocument$HTMLReader$BaseAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
+public:
+  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
+public: // actually package-private
+  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$BaseAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$BlockAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$BlockAction.h
new file mode 100644
index 000000000..52c202de2
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$BlockAction.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$BlockAction__
+#define __javax_swing_text_html_HTMLDocument$HTMLReader$BlockAction__
+
+#pragma interface
+
+#include <javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class MutableAttributeSet;
+        namespace html
+        {
+            class HTML$Tag;
+            class HTMLDocument$HTMLReader;
+            class HTMLDocument$HTMLReader$BlockAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTMLDocument$HTMLReader$BlockAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction
+{
+
+public:
+  HTMLDocument$HTMLReader$BlockAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
+  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
+  virtual void end(::javax::swing::text::html::HTML$Tag *);
+public: // actually package-private
+  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$BlockAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$CharacterAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$CharacterAction.h
new file mode 100644
index 000000000..b8ae46357
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$CharacterAction.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$CharacterAction__
+#define __javax_swing_text_html_HTMLDocument$HTMLReader$CharacterAction__
+
+#pragma interface
+
+#include <javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class MutableAttributeSet;
+        namespace html
+        {
+            class HTML$Tag;
+            class HTMLDocument$HTMLReader;
+            class HTMLDocument$HTMLReader$CharacterAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTMLDocument$HTMLReader$CharacterAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction
+{
+
+public:
+  HTMLDocument$HTMLReader$CharacterAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
+  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
+  virtual void end(::javax::swing::text::html::HTML$Tag *);
+public: // actually package-private
+  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$CharacterAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$ConvertAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$ConvertAction.h
new file mode 100644
index 000000000..a58531a12
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$ConvertAction.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$ConvertAction__
+#define __javax_swing_text_html_HTMLDocument$HTMLReader$ConvertAction__
+
+#pragma interface
+
+#include <javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class MutableAttributeSet;
+        namespace html
+        {
+            class HTML$Tag;
+            class HTMLDocument$HTMLReader;
+            class HTMLDocument$HTMLReader$ConvertAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTMLDocument$HTMLReader$ConvertAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction
+{
+
+public: // actually package-private
+  HTMLDocument$HTMLReader$ConvertAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
+public:
+  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
+  virtual void end(::javax::swing::text::html::HTML$Tag *);
+public: // actually package-private
+  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$ConvertAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$FormAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$FormAction.h
new file mode 100644
index 000000000..263088b5a
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$FormAction.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$FormAction__
+#define __javax_swing_text_html_HTMLDocument$HTMLReader$FormAction__
+
+#pragma interface
+
+#include <javax/swing/text/html/HTMLDocument$HTMLReader$SpecialAction.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class MutableAttributeSet;
+        namespace html
+        {
+            class HTML$Tag;
+            class HTMLDocument$HTMLReader;
+            class HTMLDocument$HTMLReader$FormAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTMLDocument$HTMLReader$FormAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$SpecialAction
+{
+
+public:
+  HTMLDocument$HTMLReader$FormAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
+  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
+  virtual void end(::javax::swing::text::html::HTML$Tag *);
+private:
+  void setModel(::java::lang::String *, ::javax::swing::text::MutableAttributeSet *);
+public: // actually package-private
+  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$SpecialAction)))) this$1;
+  static jboolean $assertionsDisabled;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$FormAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$FormTagAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$FormTagAction.h
new file mode 100644
index 000000000..e2e93a12b
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$FormTagAction.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$FormTagAction__
+#define __javax_swing_text_html_HTMLDocument$HTMLReader$FormTagAction__
+
+#pragma interface
+
+#include <javax/swing/text/html/HTMLDocument$HTMLReader$BlockAction.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace html
+        {
+            class HTML$Tag;
+            class HTMLDocument$HTMLReader;
+            class HTMLDocument$HTMLReader$FormTagAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTMLDocument$HTMLReader$FormTagAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$BlockAction
+{
+
+public: // actually package-private
+  HTMLDocument$HTMLReader$FormTagAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
+public:
+  virtual void end(::javax::swing::text::html::HTML$Tag *);
+public: // actually package-private
+  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$BlockAction)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$FormTagAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$HeadAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$HeadAction.h
new file mode 100644
index 000000000..c150be73a
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$HeadAction.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$HeadAction__
+#define __javax_swing_text_html_HTMLDocument$HTMLReader$HeadAction__
+
+#pragma interface
+
+#include <javax/swing/text/html/HTMLDocument$HTMLReader$BlockAction.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class MutableAttributeSet;
+        namespace html
+        {
+            class HTML$Tag;
+            class HTMLDocument$HTMLReader;
+            class HTMLDocument$HTMLReader$HeadAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTMLDocument$HTMLReader$HeadAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$BlockAction
+{
+
+public: // actually package-private
+  HTMLDocument$HTMLReader$HeadAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
+public:
+  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
+  virtual void end(::javax::swing::text::html::HTML$Tag *);
+public: // actually package-private
+  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$BlockAction)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$HeadAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$HiddenAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$HiddenAction.h
new file mode 100644
index 000000000..a7399eac4
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$HiddenAction.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$HiddenAction__
+#define __javax_swing_text_html_HTMLDocument$HTMLReader$HiddenAction__
+
+#pragma interface
+
+#include <javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class MutableAttributeSet;
+        namespace html
+        {
+            class HTML$Tag;
+            class HTMLDocument$HTMLReader;
+            class HTMLDocument$HTMLReader$HiddenAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTMLDocument$HTMLReader$HiddenAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction
+{
+
+public:
+  HTMLDocument$HTMLReader$HiddenAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
+  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
+  virtual void end(::javax::swing::text::html::HTML$Tag *);
+public: // actually package-private
+  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$HiddenAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$IsindexAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$IsindexAction.h
new file mode 100644
index 000000000..3457ed56c
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$IsindexAction.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$IsindexAction__
+#define __javax_swing_text_html_HTMLDocument$HTMLReader$IsindexAction__
+
+#pragma interface
+
+#include <javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class MutableAttributeSet;
+        namespace html
+        {
+            class HTML$Tag;
+            class HTMLDocument$HTMLReader;
+            class HTMLDocument$HTMLReader$IsindexAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTMLDocument$HTMLReader$IsindexAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction
+{
+
+public:
+  HTMLDocument$HTMLReader$IsindexAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
+  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
+public: // actually package-private
+  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$IsindexAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$LinkAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$LinkAction.h
new file mode 100644
index 000000000..2d73af750
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$LinkAction.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$LinkAction__
+#define __javax_swing_text_html_HTMLDocument$HTMLReader$LinkAction__
+
+#pragma interface
+
+#include <javax/swing/text/html/HTMLDocument$HTMLReader$HiddenAction.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class MutableAttributeSet;
+        namespace html
+        {
+            class HTML$Tag;
+            class HTMLDocument$HTMLReader;
+            class HTMLDocument$HTMLReader$LinkAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTMLDocument$HTMLReader$LinkAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$HiddenAction
+{
+
+public: // actually package-private
+  HTMLDocument$HTMLReader$LinkAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
+public:
+  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
+public: // actually package-private
+  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$HiddenAction)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$LinkAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$MapAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$MapAction.h
new file mode 100644
index 000000000..1b42e2f38
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$MapAction.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$MapAction__
+#define __javax_swing_text_html_HTMLDocument$HTMLReader$MapAction__
+
+#pragma interface
+
+#include <javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class MutableAttributeSet;
+        namespace html
+        {
+            class HTML$Tag;
+            class HTMLDocument$HTMLReader;
+            class HTMLDocument$HTMLReader$MapAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTMLDocument$HTMLReader$MapAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction
+{
+
+public: // actually package-private
+  HTMLDocument$HTMLReader$MapAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
+public:
+  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
+  virtual void end(::javax::swing::text::html::HTML$Tag *);
+public: // actually package-private
+  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$MapAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$MetaAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$MetaAction.h
new file mode 100644
index 000000000..a00b9fa22
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$MetaAction.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$MetaAction__
+#define __javax_swing_text_html_HTMLDocument$HTMLReader$MetaAction__
+
+#pragma interface
+
+#include <javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class MutableAttributeSet;
+        namespace html
+        {
+            class HTML$Tag;
+            class HTMLDocument$HTMLReader;
+            class HTMLDocument$HTMLReader$MetaAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTMLDocument$HTMLReader$MetaAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction
+{
+
+public: // actually package-private
+  HTMLDocument$HTMLReader$MetaAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
+public:
+  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
+  virtual void end(::javax::swing::text::html::HTML$Tag *);
+public: // actually package-private
+  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$MetaAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$ParagraphAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$ParagraphAction.h
new file mode 100644
index 000000000..8c816a79e
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$ParagraphAction.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$ParagraphAction__
+#define __javax_swing_text_html_HTMLDocument$HTMLReader$ParagraphAction__
+
+#pragma interface
+
+#include <javax/swing/text/html/HTMLDocument$HTMLReader$BlockAction.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class MutableAttributeSet;
+        namespace html
+        {
+            class HTML$Tag;
+            class HTMLDocument$HTMLReader;
+            class HTMLDocument$HTMLReader$ParagraphAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTMLDocument$HTMLReader$ParagraphAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$BlockAction
+{
+
+public:
+  HTMLDocument$HTMLReader$ParagraphAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
+  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
+  virtual void end(::javax::swing::text::html::HTML$Tag *);
+public: // actually package-private
+  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$BlockAction)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$ParagraphAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$PreAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$PreAction.h
new file mode 100644
index 000000000..1f5e38fd4
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$PreAction.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$PreAction__
+#define __javax_swing_text_html_HTMLDocument$HTMLReader$PreAction__
+
+#pragma interface
+
+#include <javax/swing/text/html/HTMLDocument$HTMLReader$BlockAction.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class MutableAttributeSet;
+        namespace html
+        {
+            class HTML$Tag;
+            class HTMLDocument$HTMLReader;
+            class HTMLDocument$HTMLReader$PreAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTMLDocument$HTMLReader$PreAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$BlockAction
+{
+
+public:
+  HTMLDocument$HTMLReader$PreAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
+  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
+  virtual void end(::javax::swing::text::html::HTML$Tag *);
+public: // actually package-private
+  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$BlockAction)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$PreAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$SpecialAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$SpecialAction.h
new file mode 100644
index 000000000..c1005e6fb
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$SpecialAction.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$SpecialAction__
+#define __javax_swing_text_html_HTMLDocument$HTMLReader$SpecialAction__
+
+#pragma interface
+
+#include <javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class MutableAttributeSet;
+        namespace html
+        {
+            class HTML$Tag;
+            class HTMLDocument$HTMLReader;
+            class HTMLDocument$HTMLReader$SpecialAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTMLDocument$HTMLReader$SpecialAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction
+{
+
+public:
+  HTMLDocument$HTMLReader$SpecialAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
+  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
+public: // actually package-private
+  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$SpecialAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$StyleAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$StyleAction.h
new file mode 100644
index 000000000..36feb57a0
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$StyleAction.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$StyleAction__
+#define __javax_swing_text_html_HTMLDocument$HTMLReader$StyleAction__
+
+#pragma interface
+
+#include <javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class MutableAttributeSet;
+        namespace html
+        {
+            class HTML$Tag;
+            class HTMLDocument$HTMLReader;
+            class HTMLDocument$HTMLReader$StyleAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTMLDocument$HTMLReader$StyleAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction
+{
+
+public: // actually package-private
+  HTMLDocument$HTMLReader$StyleAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
+public:
+  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
+  virtual void end(::javax::swing::text::html::HTML$Tag *);
+public: // actually package-private
+  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$StyleAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h
new file mode 100644
index 000000000..10550400b
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$TagAction__
+#define __javax_swing_text_html_HTMLDocument$HTMLReader$TagAction__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class MutableAttributeSet;
+        namespace html
+        {
+            class HTML$Tag;
+            class HTMLDocument$HTMLReader;
+            class HTMLDocument$HTMLReader$TagAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTMLDocument$HTMLReader$TagAction : public ::java::lang::Object
+{
+
+public:
+  HTMLDocument$HTMLReader$TagAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
+  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
+  virtual void end(::javax::swing::text::html::HTML$Tag *);
+public: // actually package-private
+  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$TagAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$TitleAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$TitleAction.h
new file mode 100644
index 000000000..4b7a8fe69
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$TitleAction.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$TitleAction__
+#define __javax_swing_text_html_HTMLDocument$HTMLReader$TitleAction__
+
+#pragma interface
+
+#include <javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class MutableAttributeSet;
+        namespace html
+        {
+            class HTML$Tag;
+            class HTMLDocument$HTMLReader;
+            class HTMLDocument$HTMLReader$TitleAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTMLDocument$HTMLReader$TitleAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction
+{
+
+public: // actually package-private
+  HTMLDocument$HTMLReader$TitleAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
+public:
+  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
+  virtual void end(::javax::swing::text::html::HTML$Tag *);
+public: // actually package-private
+  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction)))) this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$TitleAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader.h
new file mode 100644
index 000000000..57c250f6b
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader.h
@@ -0,0 +1,111 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader__
+#define __javax_swing_text_html_HTMLDocument$HTMLReader__
+
+#pragma interface
+
+#include <javax/swing/text/html/HTMLEditorKit$ParserCallback.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class MutableAttributeSet;
+        namespace html
+        {
+            class HTML$Tag;
+            class HTMLDocument;
+            class HTMLDocument$HTMLReader;
+            class HTMLDocument$HTMLReader$TagAction;
+            class Option;
+            class ResetablePlainDocument;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTMLDocument$HTMLReader : public ::javax::swing::text::html::HTMLEditorKit$ParserCallback
+{
+
+public:
+  HTMLDocument$HTMLReader(::javax::swing::text::html::HTMLDocument *, jint);
+  HTMLDocument$HTMLReader(::javax::swing::text::html::HTMLDocument *, jint, jint, jint, ::javax::swing::text::html::HTML$Tag *);
+public: // actually package-private
+  virtual void initTags();
+public: // actually protected
+  virtual void pushCharacterStyle();
+  virtual void popCharacterStyle();
+  virtual void registerTag(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction *);
+public:
+  virtual void flush();
+private:
+  void flushImpl();
+public:
+  virtual void handleText(JArray< jchar > *, jint);
+private:
+  jboolean shouldInsert();
+public:
+  virtual void handleStartTag(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *, jint);
+  virtual void handleComment(JArray< jchar > *, jint);
+  virtual void handleEndTag(::javax::swing::text::html::HTML$Tag *, jint);
+  virtual void handleSimpleTag(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *, jint);
+  virtual void handleEndOfLineString(::java::lang::String *);
+public: // actually protected
+  virtual void textAreaContent(JArray< jchar > *);
+  virtual void preContent(JArray< jchar > *);
+  virtual void blockOpen(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
+private:
+  jboolean inParagraph();
+  jboolean inImpliedParagraph();
+public: // actually protected
+  virtual void blockClose(::javax::swing::text::html::HTML$Tag *);
+  virtual void addContent(JArray< jchar > *, jint, jint);
+  virtual void addContent(JArray< jchar > *, jint, jint, jboolean);
+  virtual void addSpecialElement(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
+public: // actually package-private
+  static ::javax::swing::text::html::HTMLDocument * access$0(::javax::swing::text::html::HTMLDocument$HTMLReader *);
+private:
+  static const jint MAX_THRESHOLD = 10000;
+  static const jint GROW_THRESHOLD = 5;
+public: // actually protected
+  ::javax::swing::text::MutableAttributeSet * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLEditorKit$ParserCallback)))) charAttr;
+  ::java::util::Vector * parseBuffer;
+private:
+  ::java::util::Stack * parseStack;
+public: // actually package-private
+  ::java::util::Stack * charAttrStack;
+  ::java::util::HashMap * tagToAction;
+  jboolean endHTMLEncountered;
+  jint popDepth;
+  jint pushDepth;
+  jint offset;
+  ::javax::swing::text::html::HTML$Tag * insertTag;
+  jboolean insertTagEncountered;
+  jboolean debug;
+  jboolean inPreTag;
+  jboolean inStyleTag;
+  jboolean inTextArea;
+  ::java::util::ArrayList * styles;
+  ::javax::swing::text::html::ResetablePlainDocument * textAreaDocument;
+  ::java::lang::Object * selectModel;
+  ::javax::swing::text::html::Option * option;
+  jint numOptions;
+  ::java::util::HashMap * buttonGroups;
+private:
+  jint threshold;
+public: // actually package-private
+  ::javax::swing::text::html::HTMLDocument * this$0;
+  static jboolean $assertionsDisabled;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTMLDocument$HTMLReader__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$Iterator.h b/libjava/javax/swing/text/html/HTMLDocument$Iterator.h
new file mode 100644
index 000000000..3b42157ef
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTMLDocument$Iterator.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTMLDocument$Iterator__
+#define __javax_swing_text_html_HTMLDocument$Iterator__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AttributeSet;
+        namespace html
+        {
+            class HTML$Tag;
+            class HTMLDocument$Iterator;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTMLDocument$Iterator : public ::java::lang::Object
+{
+
+public:
+  HTMLDocument$Iterator();
+  virtual ::javax::swing::text::AttributeSet * getAttributes() = 0;
+  virtual jint getEndOffset() = 0;
+  virtual jint getStartOffset() = 0;
+  virtual void next() = 0;
+  virtual jboolean isValid() = 0;
+  virtual ::javax::swing::text::html::HTML$Tag * getTag() = 0;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTMLDocument$Iterator__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$LeafIterator.h b/libjava/javax/swing/text/html/HTMLDocument$LeafIterator.h
new file mode 100644
index 000000000..d449c7983
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTMLDocument$LeafIterator.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTMLDocument$LeafIterator__
+#define __javax_swing_text_html_HTMLDocument$LeafIterator__
+
+#pragma interface
+
+#include <javax/swing/text/html/HTMLDocument$Iterator.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AttributeSet;
+          class ElementIterator;
+        namespace html
+        {
+            class HTML$Tag;
+            class HTMLDocument;
+            class HTMLDocument$LeafIterator;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTMLDocument$LeafIterator : public ::javax::swing::text::html::HTMLDocument$Iterator
+{
+
+public:
+  HTMLDocument$LeafIterator(::javax::swing::text::html::HTMLDocument *, ::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::html::HTMLDocument *);
+  virtual ::javax::swing::text::AttributeSet * getAttributes();
+  virtual jint getEndOffset();
+  virtual jint getStartOffset();
+  virtual void next();
+  virtual jboolean isValid();
+  virtual ::javax::swing::text::html::HTML$Tag * getTag();
+public: // actually package-private
+  ::javax::swing::text::html::HTML$Tag * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$Iterator)))) tag;
+  ::javax::swing::text::html::HTMLDocument * doc;
+  ::javax::swing::text::ElementIterator * it;
+  ::javax::swing::text::html::HTMLDocument * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTMLDocument$LeafIterator__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$RunElement.h b/libjava/javax/swing/text/html/HTMLDocument$RunElement.h
new file mode 100644
index 000000000..f0c65d99c
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTMLDocument$RunElement.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTMLDocument$RunElement__
+#define __javax_swing_text_html_HTMLDocument$RunElement__
+
+#pragma interface
+
+#include <javax/swing/text/AbstractDocument$LeafElement.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AttributeSet;
+          class Element;
+        namespace html
+        {
+            class HTMLDocument;
+            class HTMLDocument$RunElement;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTMLDocument$RunElement : public ::javax::swing::text::AbstractDocument$LeafElement
+{
+
+public:
+  HTMLDocument$RunElement(::javax::swing::text::html::HTMLDocument *, ::javax::swing::text::Element *, ::javax::swing::text::AttributeSet *, jint, jint);
+  virtual ::java::lang::String * getName();
+  virtual ::javax::swing::text::AttributeSet * getResolveParent();
+public: // actually package-private
+  ::javax::swing::text::html::HTMLDocument * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractDocument$LeafElement)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTMLDocument$RunElement__
diff --git a/libjava/javax/swing/text/html/HTMLDocument.h b/libjava/javax/swing/text/html/HTMLDocument.h
new file mode 100644
index 000000000..014f818af
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTMLDocument.h
@@ -0,0 +1,114 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTMLDocument__
+#define __javax_swing_text_html_HTMLDocument__
+
+#pragma interface
+
+#include <javax/swing/text/DefaultStyledDocument.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace net
+    {
+        class URL;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AbstractDocument$AbstractElement;
+          class AbstractDocument$AttributeContext;
+          class AbstractDocument$Content;
+          class AbstractDocument$DefaultDocumentEvent;
+          class AttributeSet;
+          class DefaultStyledDocument$ElementSpec;
+          class Element;
+        namespace html
+        {
+            class HTML$Attribute;
+            class HTML$Tag;
+            class HTMLDocument;
+            class HTMLDocument$Iterator;
+            class HTMLEditorKit$Parser;
+            class HTMLEditorKit$ParserCallback;
+            class HTMLFrameHyperlinkEvent;
+            class StyleSheet;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTMLDocument : public ::javax::swing::text::DefaultStyledDocument
+{
+
+public:
+  HTMLDocument();
+  HTMLDocument(::javax::swing::text::html::StyleSheet *);
+  HTMLDocument(::javax::swing::text::AbstractDocument$Content *, ::javax::swing::text::html::StyleSheet *);
+  virtual ::javax::swing::text::html::StyleSheet * getStyleSheet();
+public: // actually protected
+  virtual ::javax::swing::text::AbstractDocument$AbstractElement * createDefaultRoot();
+  virtual ::javax::swing::text::Element * createLeafElement(::javax::swing::text::Element *, ::javax::swing::text::AttributeSet *, jint, jint);
+  virtual ::javax::swing::text::Element * createBranchElement(::javax::swing::text::Element *, ::javax::swing::text::AttributeSet *);
+public:
+  virtual ::javax::swing::text::html::HTMLEditorKit$Parser * getParser();
+  virtual void setParser(::javax::swing::text::html::HTMLEditorKit$Parser *);
+  virtual void setTokenThreshold(jint);
+  virtual jint getTokenThreshold();
+  virtual ::java::net::URL * getBase();
+  virtual void setBase(::java::net::URL *);
+  virtual jboolean getPreservesUnknownTags();
+  virtual void setPreservesUnknownTags(jboolean);
+  virtual void processHTMLFrameHyperlinkEvent(::javax::swing::text::html::HTMLFrameHyperlinkEvent *);
+private:
+  ::javax::swing::text::Element * findFrame(::java::lang::String *);
+  void updateFrame(::javax::swing::text::Element *, ::java::net::URL *);
+  void updateFrameSet(::javax::swing::text::Element *, ::java::net::URL *);
+public:
+  virtual ::javax::swing::text::html::HTMLDocument$Iterator * getIterator(::javax::swing::text::html::HTML$Tag *);
+  virtual ::javax::swing::text::html::HTMLEditorKit$ParserCallback * getReader(jint);
+  virtual ::javax::swing::text::html::HTMLEditorKit$ParserCallback * getReader(jint, jint, jint, ::javax::swing::text::html::HTML$Tag *);
+  virtual ::javax::swing::text::html::HTMLEditorKit$ParserCallback * getInsertingReader(jint, jint, jint, ::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::Element *);
+  virtual ::javax::swing::text::Element * getElement(::javax::swing::text::Element *, ::java::lang::Object *, ::java::lang::Object *);
+  virtual ::javax::swing::text::Element * getElement(::java::lang::String *);
+  virtual void setInnerHTML(::javax::swing::text::Element *, ::java::lang::String *);
+  virtual void setOuterHTML(::javax::swing::text::Element *, ::java::lang::String *);
+  virtual void insertBeforeStart(::javax::swing::text::Element *, ::java::lang::String *);
+  virtual void insertBeforeEnd(::javax::swing::text::Element *, ::java::lang::String *);
+  virtual void insertAfterEnd(::javax::swing::text::Element *, ::java::lang::String *);
+  virtual void insertAfterStart(::javax::swing::text::Element *, ::java::lang::String *);
+public: // actually protected
+  virtual void insertUpdate(::javax::swing::text::AbstractDocument$DefaultDocumentEvent *, ::javax::swing::text::AttributeSet *);
+public: // actually package-private
+  virtual jboolean isFrameDocument();
+  virtual void setFrameDocument(jboolean);
+  virtual ::java::lang::String * getBaseTarget();
+  virtual void updateSpecialClass(::javax::swing::text::Element *, ::javax::swing::text::html::HTML$Attribute *, ::java::lang::String *);
+  static void access$0(::javax::swing::text::html::HTMLDocument *, JArray< ::javax::swing::text::DefaultStyledDocument$ElementSpec * > *);
+  static void access$1(::javax::swing::text::html::HTMLDocument *, jint, JArray< ::javax::swing::text::DefaultStyledDocument$ElementSpec * > *);
+  static ::javax::swing::text::AbstractDocument$AttributeContext * access$2(::javax::swing::text::html::HTMLDocument *);
+public:
+  static ::java::lang::String * AdditionalComments;
+public: // actually package-private
+  ::java::net::URL * __attribute__((aligned(__alignof__( ::javax::swing::text::DefaultStyledDocument)))) baseURL;
+  jboolean preservesUnknownTags;
+  jint tokenThreshold;
+  ::javax::swing::text::html::HTMLEditorKit$Parser * parser;
+private:
+  jboolean frameDocument;
+public: // actually package-private
+  ::java::lang::String * baseTarget;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTMLDocument__
diff --git a/libjava/javax/swing/text/html/HTMLEditorKit$HTMLFactory.h b/libjava/javax/swing/text/html/HTMLEditorKit$HTMLFactory.h
new file mode 100644
index 000000000..8780e781a
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTMLEditorKit$HTMLFactory.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTMLEditorKit$HTMLFactory__
+#define __javax_swing_text_html_HTMLEditorKit$HTMLFactory__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Element;
+          class View;
+        namespace html
+        {
+            class HTMLEditorKit$HTMLFactory;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTMLEditorKit$HTMLFactory : public ::java::lang::Object
+{
+
+public:
+  HTMLEditorKit$HTMLFactory();
+  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTMLEditorKit$HTMLFactory__
diff --git a/libjava/javax/swing/text/html/HTMLEditorKit$HTMLTextAction.h b/libjava/javax/swing/text/html/HTMLEditorKit$HTMLTextAction.h
new file mode 100644
index 000000000..05cf7f3e5
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTMLEditorKit$HTMLTextAction.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTMLEditorKit$HTMLTextAction__
+#define __javax_swing_text_html_HTMLEditorKit$HTMLTextAction__
+
+#pragma interface
+
+#include <javax/swing/text/StyledEditorKit$StyledTextAction.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class JEditorPane;
+      namespace text
+      {
+          class Element;
+        namespace html
+        {
+            class HTML$Tag;
+            class HTMLDocument;
+            class HTMLEditorKit;
+            class HTMLEditorKit$HTMLTextAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTMLEditorKit$HTMLTextAction : public ::javax::swing::text::StyledEditorKit$StyledTextAction
+{
+
+public:
+  HTMLEditorKit$HTMLTextAction(::java::lang::String *);
+public: // actually protected
+  virtual ::javax::swing::text::html::HTMLDocument * getHTMLDocument(::javax::swing::JEditorPane *);
+  virtual ::javax::swing::text::html::HTMLEditorKit * getHTMLEditorKit(::javax::swing::JEditorPane *);
+  virtual JArray< ::javax::swing::text::Element * > * getElementsAt(::javax::swing::text::html::HTMLDocument *, jint);
+private:
+  JArray< ::javax::swing::text::Element * > * getElementsAt(::javax::swing::text::Element *, jint, jint);
+public: // actually protected
+  virtual jint elementCountToTag(::javax::swing::text::html::HTMLDocument *, jint, ::javax::swing::text::html::HTML$Tag *);
+  virtual ::javax::swing::text::Element * findElementMatchingTag(::javax::swing::text::html::HTMLDocument *, jint, ::javax::swing::text::html::HTML$Tag *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTMLEditorKit$HTMLTextAction__
diff --git a/libjava/javax/swing/text/html/HTMLEditorKit$InsertHTMLTextAction.h b/libjava/javax/swing/text/html/HTMLEditorKit$InsertHTMLTextAction.h
new file mode 100644
index 000000000..187c7a8ee
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTMLEditorKit$InsertHTMLTextAction.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTMLEditorKit$InsertHTMLTextAction__
+#define __javax_swing_text_html_HTMLEditorKit$InsertHTMLTextAction__
+
+#pragma interface
+
+#include <javax/swing/text/html/HTMLEditorKit$HTMLTextAction.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JEditorPane;
+      namespace text
+      {
+          class Element;
+        namespace html
+        {
+            class HTML$Tag;
+            class HTMLDocument;
+            class HTMLEditorKit$InsertHTMLTextAction;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTMLEditorKit$InsertHTMLTextAction : public ::javax::swing::text::html::HTMLEditorKit$HTMLTextAction
+{
+
+public:
+  HTMLEditorKit$InsertHTMLTextAction(::java::lang::String *, ::java::lang::String *, ::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::html::HTML$Tag *);
+  HTMLEditorKit$InsertHTMLTextAction(::java::lang::String *, ::java::lang::String *, ::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::html::HTML$Tag *);
+public: // actually protected
+  virtual void insertHTML(::javax::swing::JEditorPane *, ::javax::swing::text::html::HTMLDocument *, jint, ::java::lang::String *, jint, jint, ::javax::swing::text::html::HTML$Tag *);
+  virtual void insertAtBoundary(::javax::swing::JEditorPane *, ::javax::swing::text::html::HTMLDocument *, jint, ::javax::swing::text::Element *, ::java::lang::String *, ::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::html::HTML$Tag *);
+  virtual void insertAtBoundry(::javax::swing::JEditorPane *, ::javax::swing::text::html::HTMLDocument *, jint, ::javax::swing::text::Element *, ::java::lang::String *, ::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::html::HTML$Tag *);
+public:
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+private:
+  jboolean tryInsert(::javax::swing::JEditorPane *, ::javax::swing::text::html::HTMLDocument *, jint, ::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::html::HTML$Tag *);
+  void adjustSelection(::javax::swing::JEditorPane *, ::javax::swing::text::html::HTMLDocument *, jint, jint);
+public: // actually protected
+  ::javax::swing::text::html::HTML$Tag * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLEditorKit$HTMLTextAction)))) addTag;
+  ::javax::swing::text::html::HTML$Tag * alternateAddTag;
+  ::javax::swing::text::html::HTML$Tag * alternateParentTag;
+  ::java::lang::String * html;
+  ::javax::swing::text::html::HTML$Tag * parentTag;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTMLEditorKit$InsertHTMLTextAction__
diff --git a/libjava/javax/swing/text/html/HTMLEditorKit$LinkController.h b/libjava/javax/swing/text/html/HTMLEditorKit$LinkController.h
new file mode 100644
index 000000000..629cc679e
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTMLEditorKit$LinkController.h
@@ -0,0 +1,63 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTMLEditorKit$LinkController__
+#define __javax_swing_text_html_HTMLEditorKit$LinkController__
+
+#pragma interface
+
+#include <java/awt/event/MouseAdapter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace event
+      {
+          class MouseEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JEditorPane;
+      namespace event
+      {
+          class HyperlinkEvent;
+      }
+      namespace text
+      {
+          class AttributeSet;
+          class Element;
+        namespace html
+        {
+            class HTMLDocument;
+            class HTMLEditorKit$LinkController;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTMLEditorKit$LinkController : public ::java::awt::event::MouseAdapter
+{
+
+public:
+  HTMLEditorKit$LinkController();
+  virtual void mouseClicked(::java::awt::event::MouseEvent *);
+  virtual void mouseDragged(::java::awt::event::MouseEvent *);
+  virtual void mouseMoved(::java::awt::event::MouseEvent *);
+public: // actually protected
+  virtual void activateLink(jint, ::javax::swing::JEditorPane *);
+private:
+  void activateLink(jint, ::javax::swing::JEditorPane *, jint, jint);
+  ::javax::swing::event::HyperlinkEvent * createHyperlinkEvent(::javax::swing::JEditorPane *, ::javax::swing::text::html::HTMLDocument *, ::java::lang::String *, ::javax::swing::text::AttributeSet *, ::javax::swing::text::Element *);
+  ::javax::swing::text::Element * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) lastAnchorElement;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTMLEditorKit$LinkController__
diff --git a/libjava/javax/swing/text/html/HTMLEditorKit$Parser.h b/libjava/javax/swing/text/html/HTMLEditorKit$Parser.h
new file mode 100644
index 000000000..8727c6ca6
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTMLEditorKit$Parser.h
@@ -0,0 +1,37 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTMLEditorKit$Parser__
+#define __javax_swing_text_html_HTMLEditorKit$Parser__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace html
+        {
+            class HTMLEditorKit$Parser;
+            class HTMLEditorKit$ParserCallback;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTMLEditorKit$Parser : public ::java::lang::Object
+{
+
+public:
+  HTMLEditorKit$Parser();
+  virtual void parse(::java::io::Reader *, ::javax::swing::text::html::HTMLEditorKit$ParserCallback *, jboolean) = 0;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTMLEditorKit$Parser__
diff --git a/libjava/javax/swing/text/html/HTMLEditorKit$ParserCallback.h b/libjava/javax/swing/text/html/HTMLEditorKit$ParserCallback.h
new file mode 100644
index 000000000..83dffff94
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTMLEditorKit$ParserCallback.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTMLEditorKit$ParserCallback__
+#define __javax_swing_text_html_HTMLEditorKit$ParserCallback__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class MutableAttributeSet;
+        namespace html
+        {
+            class HTML$Tag;
+            class HTMLEditorKit$ParserCallback;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTMLEditorKit$ParserCallback : public ::java::lang::Object
+{
+
+public:
+  HTMLEditorKit$ParserCallback();
+  virtual void flush();
+  virtual void handleComment(JArray< jchar > *, jint);
+  virtual void handleEndOfLineString(::java::lang::String *);
+  virtual void handleEndTag(::javax::swing::text::html::HTML$Tag *, jint);
+  virtual void handleError(::java::lang::String *, jint);
+  virtual void handleSimpleTag(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *, jint);
+  virtual void handleStartTag(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *, jint);
+  virtual void handleText(JArray< jchar > *, jint);
+  static ::java::lang::Object * IMPLIED;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTMLEditorKit$ParserCallback__
diff --git a/libjava/javax/swing/text/html/HTMLEditorKit.h b/libjava/javax/swing/text/html/HTMLEditorKit.h
new file mode 100644
index 000000000..4c3bc412c
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTMLEditorKit.h
@@ -0,0 +1,119 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTMLEditorKit__
+#define __javax_swing_text_html_HTMLEditorKit__
+
+#pragma interface
+
+#include <javax/swing/text/StyledEditorKit.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Cursor;
+    }
+  }
+  namespace javax
+  {
+    namespace accessibility
+    {
+        class AccessibleContext;
+    }
+    namespace swing
+    {
+        class Action;
+        class JEditorPane;
+      namespace text
+      {
+          class Document;
+          class Element;
+          class MutableAttributeSet;
+          class ViewFactory;
+        namespace html
+        {
+            class HTML$Tag;
+            class HTMLDocument;
+            class HTMLEditorKit;
+            class HTMLEditorKit$HTMLFactory;
+            class HTMLEditorKit$LinkController;
+            class HTMLEditorKit$Parser;
+            class StyleSheet;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTMLEditorKit : public ::javax::swing::text::StyledEditorKit
+{
+
+public:
+  HTMLEditorKit();
+  virtual ::javax::swing::text::ViewFactory * getViewFactory();
+  virtual ::javax::swing::text::Document * createDefaultDocument();
+public: // actually protected
+  virtual ::javax::swing::text::html::HTMLEditorKit$Parser * getParser();
+public:
+  virtual void insertHTML(::javax::swing::text::html::HTMLDocument *, jint, ::java::lang::String *, jint, jint, ::javax::swing::text::html::HTML$Tag *);
+  virtual void read(::java::io::Reader *, ::javax::swing::text::Document *, jint);
+  virtual void write(::java::io::Writer *, ::javax::swing::text::Document *, jint, jint);
+  virtual ::java::lang::String * getContentType();
+  virtual ::java::lang::Object * clone();
+public: // actually protected
+  virtual void createInputAttributes(::javax::swing::text::Element *, ::javax::swing::text::MutableAttributeSet *);
+public:
+  virtual void install(::javax::swing::JEditorPane *);
+  virtual void deinstall(::javax::swing::JEditorPane *);
+  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
+  virtual JArray< ::javax::swing::Action * > * getActions();
+  virtual ::java::awt::Cursor * getDefaultCursor();
+  virtual ::java::awt::Cursor * getLinkCursor();
+  virtual void setLinkCursor(::java::awt::Cursor *);
+  virtual void setDefaultCursor(::java::awt::Cursor *);
+  virtual ::javax::swing::text::MutableAttributeSet * getInputAttributes();
+  virtual ::javax::swing::text::html::StyleSheet * getStyleSheet();
+  virtual void setStyleSheet(::javax::swing::text::html::StyleSheet *);
+  virtual jboolean isAutoFormSubmission();
+  virtual void setAutoFormSubmission(jboolean);
+private:
+  static const jlong serialVersionUID = 8751997116710384592LL;
+public:
+  static ::java::lang::String * DEFAULT_CSS;
+  static ::java::lang::String * BOLD_ACTION;
+  static ::java::lang::String * ITALIC_ACTION;
+  static ::java::lang::String * COLOR_ACTION;
+  static ::java::lang::String * FONT_CHANGE_BIGGER;
+  static ::java::lang::String * FONT_CHANGE_SMALLER;
+  static ::java::lang::String * IMG_ALIGN_BOTTOM;
+  static ::java::lang::String * IMG_ALIGN_MIDDLE;
+  static ::java::lang::String * IMG_ALIGN_TOP;
+  static ::java::lang::String * IMG_BORDER;
+  static ::java::lang::String * LOGICAL_STYLE_ACTION;
+  static ::java::lang::String * PARA_INDENT_LEFT;
+  static ::java::lang::String * PARA_INDENT_RIGHT;
+private:
+  static JArray< ::javax::swing::Action * > * defaultActions;
+  ::javax::swing::text::html::StyleSheet * __attribute__((aligned(__alignof__( ::javax::swing::text::StyledEditorKit)))) styleSheet;
+public: // actually package-private
+  ::javax::swing::text::html::HTMLEditorKit$HTMLFactory * viewFactory;
+  ::java::awt::Cursor * linkCursor;
+  ::java::awt::Cursor * defaultCursor;
+  ::javax::swing::text::html::HTMLEditorKit$Parser * parser;
+private:
+  ::javax::swing::text::html::HTMLEditorKit$LinkController * linkController;
+public: // actually package-private
+  ::java::lang::String * contentType;
+  ::javax::swing::text::MutableAttributeSet * inputAttributes;
+  ::javax::swing::JEditorPane * editorPane;
+private:
+  jboolean autoFormSubmission;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTMLEditorKit__
diff --git a/libjava/javax/swing/text/html/HTMLFrameHyperlinkEvent.h b/libjava/javax/swing/text/html/HTMLFrameHyperlinkEvent.h
new file mode 100644
index 000000000..140395092
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTMLFrameHyperlinkEvent.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTMLFrameHyperlinkEvent__
+#define __javax_swing_text_html_HTMLFrameHyperlinkEvent__
+
+#pragma interface
+
+#include <javax/swing/event/HyperlinkEvent.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace net
+    {
+        class URL;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class HyperlinkEvent$EventType;
+      }
+      namespace text
+      {
+          class Element;
+        namespace html
+        {
+            class HTMLFrameHyperlinkEvent;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTMLFrameHyperlinkEvent : public ::javax::swing::event::HyperlinkEvent
+{
+
+public:
+  HTMLFrameHyperlinkEvent(::java::lang::Object *, ::javax::swing::event::HyperlinkEvent$EventType *, ::java::net::URL *, ::javax::swing::text::Element *, ::java::lang::String *);
+  HTMLFrameHyperlinkEvent(::java::lang::Object *, ::javax::swing::event::HyperlinkEvent$EventType *, ::java::net::URL *, ::java::lang::String *);
+  HTMLFrameHyperlinkEvent(::java::lang::Object *, ::javax::swing::event::HyperlinkEvent$EventType *, ::java::net::URL *, ::java::lang::String *, ::javax::swing::text::Element *, ::java::lang::String *);
+  HTMLFrameHyperlinkEvent(::java::lang::Object *, ::javax::swing::event::HyperlinkEvent$EventType *, ::java::net::URL *, ::java::lang::String *, ::java::lang::String *);
+  virtual ::java::lang::String * getTarget();
+private:
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::event::HyperlinkEvent)))) target_frame;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTMLFrameHyperlinkEvent__
diff --git a/libjava/javax/swing/text/html/HTMLWriter.h b/libjava/javax/swing/text/html/HTMLWriter.h
new file mode 100644
index 000000000..63684b793
--- /dev/null
+++ b/libjava/javax/swing/text/html/HTMLWriter.h
@@ -0,0 +1,86 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_HTMLWriter__
+#define __javax_swing_text_html_HTMLWriter__
+
+#pragma interface
+
+#include <javax/swing/text/AbstractWriter.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AttributeSet;
+          class Element;
+        namespace html
+        {
+            class HTML$Tag;
+            class HTMLDocument;
+            class HTMLWriter;
+            class Option;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::HTMLWriter : public ::javax::swing::text::AbstractWriter
+{
+
+public:
+  HTMLWriter(::java::io::Writer *, ::javax::swing::text::html::HTMLDocument *);
+  HTMLWriter(::java::io::Writer *, ::javax::swing::text::html::HTMLDocument *, jint, jint);
+  virtual void write();
+public: // actually protected
+  virtual void writeAttributes(::javax::swing::text::AttributeSet *);
+  virtual void emptyTag(::javax::swing::text::Element *);
+  virtual jboolean isBlockTag(::javax::swing::text::AttributeSet *);
+  virtual void startTag(::javax::swing::text::Element *);
+  virtual void textAreaContent(::javax::swing::text::AttributeSet *);
+  virtual void text(::javax::swing::text::Element *);
+  virtual void selectContent(::javax::swing::text::AttributeSet *);
+  virtual void writeOption(::javax::swing::text::html::Option *);
+  virtual void endTag(::javax::swing::text::Element *);
+  virtual void comment(::javax::swing::text::Element *);
+  virtual jboolean synthesizedElement(::javax::swing::text::Element *);
+  virtual jboolean matchNameAttribute(::javax::swing::text::AttributeSet *, ::javax::swing::text::html::HTML$Tag *);
+  virtual void writeEmbeddedTags(::javax::swing::text::AttributeSet *);
+  virtual void closeOutUnwantedEmbeddedTags(::javax::swing::text::AttributeSet *);
+  virtual void writeLineSeparator();
+  virtual void output(JArray< jchar > *, jint, jint);
+private:
+  void traverse(::javax::swing::text::Element *);
+  void traverseHtmlFragment(::javax::swing::text::Element *);
+  void writeRaw(::java::lang::String *);
+  void writeContent(::java::lang::String *);
+  void writeAllAttributes(::javax::swing::text::AttributeSet *);
+  jboolean hasHtmlEntity(::java::lang::String *);
+  jboolean isCharHtmlEntity(jchar);
+  ::java::lang::String * escapeCharHtmlEntity(jchar);
+  ::java::io::Writer * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractWriter)))) outWriter;
+  ::javax::swing::text::html::HTMLDocument * htmlDoc;
+  ::java::util::HashSet * openEmbeddedTagHashSet;
+  ::java::lang::String * new_line_str;
+  JArray< jchar > * html_entity_char_arr;
+  JArray< ::java::lang::String * > * html_entity_escape_str_arr;
+  jint doc_pos;
+  jint doc_len;
+  jint doc_offset_remaining;
+  jint doc_len_remaining;
+  ::java::util::HashSet * htmlFragmentParentHashSet;
+  ::javax::swing::text::Element * startElem;
+  ::javax::swing::text::Element * endElem;
+  jboolean fg_pass_start_elem;
+  jboolean fg_pass_end_elem;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_HTMLWriter__
diff --git a/libjava/javax/swing/text/html/ImageView$1.h b/libjava/javax/swing/text/html/ImageView$1.h
new file mode 100644
index 000000000..b6acde756
--- /dev/null
+++ b/libjava/javax/swing/text/html/ImageView$1.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_ImageView$1__
+#define __javax_swing_text_html_ImageView$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class View;
+        namespace html
+        {
+            class ImageView;
+            class ImageView$1;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::ImageView$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  ImageView$1(::javax::swing::text::html::ImageView *, ::javax::swing::text::View *, jboolean, jboolean);
+public:
+  virtual void run();
+public: // actually package-private
+  ::javax::swing::text::html::ImageView * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+private:
+  ::javax::swing::text::View * val$v;
+  jboolean val$width;
+  jboolean val$height;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_ImageView$1__
diff --git a/libjava/javax/swing/text/html/ImageView$Observer.h b/libjava/javax/swing/text/html/ImageView$Observer.h
new file mode 100644
index 000000000..be4b8dbf9
--- /dev/null
+++ b/libjava/javax/swing/text/html/ImageView$Observer.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_ImageView$Observer__
+#define __javax_swing_text_html_ImageView$Observer__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Image;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace html
+        {
+            class ImageView;
+            class ImageView$Observer;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::ImageView$Observer : public ::java::lang::Object
+{
+
+public: // actually package-private
+  ImageView$Observer(::javax::swing::text::html::ImageView *);
+public:
+  virtual jboolean imageUpdate(::java::awt::Image *, jint, jint, jint, jint, jint);
+public: // actually package-private
+  ::javax::swing::text::html::ImageView * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_ImageView$Observer__
diff --git a/libjava/javax/swing/text/html/ImageView.h b/libjava/javax/swing/text/html/ImageView.h
new file mode 100644
index 000000000..91b96bc01
--- /dev/null
+++ b/libjava/javax/swing/text/html/ImageView.h
@@ -0,0 +1,126 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_ImageView__
+#define __javax_swing_text_html_ImageView__
+
+#pragma interface
+
+#include <javax/swing/text/View.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace swing
+      {
+        namespace text
+        {
+          namespace html
+          {
+            namespace css
+            {
+                class Length;
+            }
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+        class Image;
+        class Shape;
+      namespace image
+      {
+          class ImageObserver;
+      }
+    }
+    namespace net
+    {
+        class URL;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+      namespace text
+      {
+          class AttributeSet;
+          class Element;
+          class Position$Bias;
+          class View;
+        namespace html
+        {
+            class ImageView;
+            class StyleSheet;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::ImageView : public ::javax::swing::text::View
+{
+
+public:
+  ImageView(::javax::swing::text::Element *);
+private:
+  void reloadImage();
+public:
+  virtual jfloat getAlignment(jint);
+  virtual ::java::lang::String * getAltText();
+  virtual ::javax::swing::text::AttributeSet * getAttributes();
+  virtual ::java::awt::Image * getImage();
+  virtual ::java::net::URL * getImageURL();
+  virtual ::javax::swing::Icon * getLoadingImageIcon();
+  virtual jboolean getLoadsSynchronously();
+  virtual ::javax::swing::Icon * getNoImageIcon();
+  virtual jfloat getPreferredSpan(jint);
+public: // actually protected
+  virtual ::javax::swing::text::html::StyleSheet * getStyleSheet();
+public:
+  virtual ::java::lang::String * getToolTipText(jfloat, jfloat, ::java::awt::Shape *);
+  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
+  virtual void setLoadsSynchronously(jboolean);
+public: // actually protected
+  virtual void setPropertiesFromAttributes();
+public:
+  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
+  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
+  virtual void setSize(jfloat, jfloat);
+private:
+  void updateState();
+  void loadImage();
+  void updateSize();
+public: // actually package-private
+  virtual void safePreferenceChanged(::javax::swing::text::View *, jboolean, jboolean);
+  jboolean __attribute__((aligned(__alignof__( ::javax::swing::text::View)))) loadOnDemand;
+  ::java::awt::Image * image;
+  jbyte imageState;
+private:
+  jboolean reloadImage__;
+  jboolean reloadProperties;
+  jboolean haveWidth;
+  jboolean haveHeight;
+  jboolean loading;
+  jint width;
+  jint height;
+  ::java::awt::image::ImageObserver * observer;
+public: // actually package-private
+  JArray< ::gnu::javax::swing::text::html::css::Length * > * spans;
+private:
+  ::javax::swing::text::AttributeSet * attributes;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_ImageView__
diff --git a/libjava/javax/swing/text/html/InlineView.h b/libjava/javax/swing/text/html/InlineView.h
new file mode 100644
index 000000000..0d552dd7e
--- /dev/null
+++ b/libjava/javax/swing/text/html/InlineView.h
@@ -0,0 +1,69 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_InlineView__
+#define __javax_swing_text_html_InlineView__
+
+#pragma interface
+
+#include <javax/swing/text/LabelView.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class DocumentEvent;
+      }
+      namespace text
+      {
+          class AttributeSet;
+          class Element;
+          class View;
+          class ViewFactory;
+        namespace html
+        {
+            class InlineView;
+            class StyleSheet;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::InlineView : public ::javax::swing::text::LabelView
+{
+
+public:
+  InlineView(::javax::swing::text::Element *);
+  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual ::javax::swing::text::AttributeSet * getAttributes();
+  virtual jint getBreakWeight(jint, jfloat, jfloat);
+  virtual ::javax::swing::text::View * breakView(jint, jint, jfloat, jfloat);
+public: // actually protected
+  virtual void setPropertiesFromAttributes();
+  virtual ::javax::swing::text::html::StyleSheet * getStyleSheet();
+public:
+  virtual jfloat getMinimumSpan(jint);
+private:
+  jfloat getLongestWord();
+  jfloat calculateLongestWord();
+  ::javax::swing::text::AttributeSet * __attribute__((aligned(__alignof__( ::javax::swing::text::LabelView)))) attributes;
+  jfloat longestWord;
+  jboolean nowrap;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_InlineView__
diff --git a/libjava/javax/swing/text/html/ListView.h b/libjava/javax/swing/text/html/ListView.h
new file mode 100644
index 000000000..7e179a90c
--- /dev/null
+++ b/libjava/javax/swing/text/html/ListView.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_ListView__
+#define __javax_swing_text_html_ListView__
+
+#pragma interface
+
+#include <javax/swing/text/html/BlockView.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+        class Rectangle;
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Element;
+        namespace html
+        {
+            class ListView;
+            class StyleSheet$ListPainter;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::ListView : public ::javax::swing::text::html::BlockView
+{
+
+public:
+  ListView(::javax::swing::text::Element *);
+  virtual jfloat getAlignment(jint);
+  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
+public: // actually protected
+  virtual void paintChild(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
+  virtual void setPropertiesFromAttributes();
+private:
+  ::javax::swing::text::html::StyleSheet$ListPainter * __attribute__((aligned(__alignof__( ::javax::swing::text::html::BlockView)))) painter;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_ListView__
diff --git a/libjava/javax/swing/text/html/MinimalHTMLWriter.h b/libjava/javax/swing/text/html/MinimalHTMLWriter.h
new file mode 100644
index 000000000..a44b17005
--- /dev/null
+++ b/libjava/javax/swing/text/html/MinimalHTMLWriter.h
@@ -0,0 +1,80 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_MinimalHTMLWriter__
+#define __javax_swing_text_html_MinimalHTMLWriter__
+
+#pragma interface
+
+#include <javax/swing/text/AbstractWriter.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AttributeSet;
+          class Element;
+          class Style;
+          class StyledDocument;
+        namespace html
+        {
+            class MinimalHTMLWriter;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::MinimalHTMLWriter : public ::javax::swing::text::AbstractWriter
+{
+
+public:
+  MinimalHTMLWriter(::java::io::Writer *, ::javax::swing::text::StyledDocument *);
+  MinimalHTMLWriter(::java::io::Writer *, ::javax::swing::text::StyledDocument *, jint, jint);
+public: // actually protected
+  virtual void startFontTag(::java::lang::String *);
+  virtual jboolean inFontTag();
+  virtual void endFontTag();
+public:
+  virtual void write();
+public: // actually protected
+  virtual void writeStartTag(::java::lang::String *);
+  virtual void writeEndTag(::java::lang::String *);
+  virtual void writeHeader();
+  virtual void writeStartParagraph(::javax::swing::text::Element *);
+  virtual void writeEndParagraph();
+  virtual void writeBody();
+  virtual void text(::javax::swing::text::Element *);
+  virtual void writeHTMLTags(::javax::swing::text::AttributeSet *);
+  virtual jboolean isText(::javax::swing::text::Element *);
+  virtual void writeContent(::javax::swing::text::Element *, jboolean);
+  virtual void writeLeaf(::javax::swing::text::Element *);
+  virtual void writeNonHTMLAttributes(::javax::swing::text::AttributeSet *);
+  virtual void writeStyles();
+  virtual void writeAttributes(::javax::swing::text::AttributeSet *);
+  virtual void writeComponent(::javax::swing::text::Element *);
+  virtual void writeImage(::javax::swing::text::Element *);
+private:
+  ::java::lang::String * getAttribute(::java::lang::String *, ::java::lang::Object *);
+  ::java::lang::String * getColor(::java::awt::Color *);
+  void endOpenTags();
+  void writeStyle(::javax::swing::text::Style *);
+  jboolean hasText(::javax::swing::text::Element *);
+  ::javax::swing::text::StyledDocument * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractWriter)))) doc;
+  ::java::util::Deque * tagStack;
+  jboolean inFontTag__;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_MinimalHTMLWriter__
diff --git a/libjava/javax/swing/text/html/MultiAttributeSet$MultiNameEnumeration.h b/libjava/javax/swing/text/html/MultiAttributeSet$MultiNameEnumeration.h
new file mode 100644
index 000000000..5705c57ad
--- /dev/null
+++ b/libjava/javax/swing/text/html/MultiAttributeSet$MultiNameEnumeration.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_MultiAttributeSet$MultiNameEnumeration__
+#define __javax_swing_text_html_MultiAttributeSet$MultiNameEnumeration__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace html
+        {
+            class MultiAttributeSet;
+            class MultiAttributeSet$MultiNameEnumeration;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::MultiAttributeSet$MultiNameEnumeration : public ::java::lang::Object
+{
+
+public: // actually package-private
+  MultiAttributeSet$MultiNameEnumeration(::javax::swing::text::html::MultiAttributeSet *);
+public:
+  virtual jboolean hasMoreElements();
+  virtual ::java::lang::Object * nextElement();
+private:
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) index;
+  ::java::util::Enumeration * current;
+public: // actually package-private
+  ::javax::swing::text::html::MultiAttributeSet * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_MultiAttributeSet$MultiNameEnumeration__
diff --git a/libjava/javax/swing/text/html/MultiAttributeSet.h b/libjava/javax/swing/text/html/MultiAttributeSet.h
new file mode 100644
index 000000000..f189e7c55
--- /dev/null
+++ b/libjava/javax/swing/text/html/MultiAttributeSet.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_MultiAttributeSet__
+#define __javax_swing_text_html_MultiAttributeSet__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AttributeSet;
+        namespace html
+        {
+            class MultiAttributeSet;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::MultiAttributeSet : public ::java::lang::Object
+{
+
+public: // actually package-private
+  MultiAttributeSet();
+  MultiAttributeSet(JArray< ::javax::swing::text::AttributeSet * > *);
+  virtual void init(JArray< ::javax::swing::text::AttributeSet * > *);
+public:
+  virtual jboolean containsAttribute(::java::lang::Object *, ::java::lang::Object *);
+  virtual jboolean containsAttributes(::javax::swing::text::AttributeSet *);
+  virtual ::javax::swing::text::AttributeSet * copyAttributes();
+  virtual ::java::lang::Object * getAttribute(::java::lang::Object *);
+  virtual jint getAttributeCount();
+  virtual ::java::util::Enumeration * getAttributeNames();
+  virtual ::javax::swing::text::AttributeSet * getResolveParent();
+  virtual jboolean isDefined(::java::lang::Object *);
+  virtual jboolean isEqual(::javax::swing::text::AttributeSet *);
+public: // actually package-private
+  JArray< ::javax::swing::text::AttributeSet * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) multi;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_MultiAttributeSet__
diff --git a/libjava/javax/swing/text/html/MultiStyle.h b/libjava/javax/swing/text/html/MultiStyle.h
new file mode 100644
index 000000000..f330d5f6e
--- /dev/null
+++ b/libjava/javax/swing/text/html/MultiStyle.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_MultiStyle__
+#define __javax_swing_text_html_MultiStyle__
+
+#pragma interface
+
+#include <javax/swing/text/html/MultiAttributeSet.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ChangeListener;
+      }
+      namespace text
+      {
+          class AttributeSet;
+          class SimpleAttributeSet;
+        namespace html
+        {
+            class MultiStyle;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::MultiStyle : public ::javax::swing::text::html::MultiAttributeSet
+{
+
+public:
+  MultiStyle(::java::lang::String *, JArray< ::javax::swing::text::AttributeSet * > *);
+  virtual ::java::lang::String * getName();
+  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
+  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
+  virtual void addAttribute(::java::lang::Object *, ::java::lang::Object *);
+  virtual void addAttributes(::javax::swing::text::AttributeSet *);
+  virtual void removeAttribute(::java::lang::Object *);
+  virtual void removeAttributes(::java::util::Enumeration *);
+  virtual void removeAttributes(::javax::swing::text::AttributeSet *);
+  virtual void setResolveParent(::javax::swing::text::AttributeSet *);
+private:
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::text::html::MultiAttributeSet)))) name;
+  ::javax::swing::text::SimpleAttributeSet * attributes;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_MultiStyle__
diff --git a/libjava/javax/swing/text/html/NullView.h b/libjava/javax/swing/text/html/NullView.h
new file mode 100644
index 000000000..2947ee727
--- /dev/null
+++ b/libjava/javax/swing/text/html/NullView.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_NullView__
+#define __javax_swing_text_html_NullView__
+
+#pragma interface
+
+#include <javax/swing/text/View.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Element;
+          class Position$Bias;
+        namespace html
+        {
+            class NullView;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::NullView : public ::javax::swing::text::View
+{
+
+public:
+  NullView(::javax::swing::text::Element *);
+  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
+  virtual jfloat getPreferredSpan(jint);
+  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
+  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_NullView__
diff --git a/libjava/javax/swing/text/html/ObjectView.h b/libjava/javax/swing/text/html/ObjectView.h
new file mode 100644
index 000000000..666b671aa
--- /dev/null
+++ b/libjava/javax/swing/text/html/ObjectView.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_ObjectView__
+#define __javax_swing_text_html_ObjectView__
+
+#pragma interface
+
+#include <javax/swing/text/ComponentView.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Element;
+        namespace html
+        {
+            class ObjectView;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::ObjectView : public ::javax::swing::text::ComponentView
+{
+
+public:
+  ObjectView(::javax::swing::text::Element *);
+public: // actually protected
+  virtual ::java::awt::Component * createComponent();
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_ObjectView__
diff --git a/libjava/javax/swing/text/html/Option.h b/libjava/javax/swing/text/html/Option.h
new file mode 100644
index 000000000..062c069e9
--- /dev/null
+++ b/libjava/javax/swing/text/html/Option.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_Option__
+#define __javax_swing_text_html_Option__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AttributeSet;
+        namespace html
+        {
+            class Option;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::Option : public ::java::lang::Object
+{
+
+public:
+  Option(::javax::swing::text::AttributeSet *);
+  virtual void setLabel(::java::lang::String *);
+  virtual ::java::lang::String * getLabel();
+  virtual ::javax::swing::text::AttributeSet * getAttributes();
+  virtual ::java::lang::String * toString();
+public: // actually protected
+  virtual void setSelection(jboolean);
+public:
+  virtual jboolean isSelected();
+  virtual ::java::lang::String * getValue();
+private:
+  ::javax::swing::text::AttributeSet * __attribute__((aligned(__alignof__( ::java::lang::Object)))) attributes;
+  ::java::lang::String * label;
+  jboolean selected;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_Option__
diff --git a/libjava/javax/swing/text/html/ParagraphView.h b/libjava/javax/swing/text/html/ParagraphView.h
new file mode 100644
index 000000000..6e166ad87
--- /dev/null
+++ b/libjava/javax/swing/text/html/ParagraphView.h
@@ -0,0 +1,88 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_ParagraphView__
+#define __javax_swing_text_html_ParagraphView__
+
+#pragma interface
+
+#include <javax/swing/text/ParagraphView.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace swing
+      {
+        namespace text
+        {
+          namespace html
+          {
+            namespace css
+            {
+                class Length;
+            }
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class SizeRequirements;
+      namespace text
+      {
+          class AttributeSet;
+          class Element;
+          class View;
+        namespace html
+        {
+            class ParagraphView;
+            class StyleSheet;
+            class StyleSheet$BoxPainter;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::ParagraphView : public ::javax::swing::text::ParagraphView
+{
+
+public:
+  ParagraphView(::javax::swing::text::Element *);
+  virtual void setParent(::javax::swing::text::View *);
+  virtual ::javax::swing::text::AttributeSet * getAttributes();
+public: // actually protected
+  virtual void setPropertiesFromAttributes();
+  virtual ::javax::swing::text::html::StyleSheet * getStyleSheet();
+  virtual ::javax::swing::SizeRequirements * calculateMinorAxisRequirements(jint, ::javax::swing::SizeRequirements *);
+private:
+  jboolean setCSSSpan(::javax::swing::SizeRequirements *, jint);
+public:
+  virtual jboolean isVisible();
+  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
+  virtual jfloat getPreferredSpan(jint);
+  virtual jfloat getMinimumSpan(jint);
+  virtual jfloat getMaximumSpan(jint);
+private:
+  ::javax::swing::text::AttributeSet * __attribute__((aligned(__alignof__( ::javax::swing::text::ParagraphView)))) attributes;
+  ::javax::swing::text::html::StyleSheet$BoxPainter * painter;
+  ::gnu::javax::swing::text::html::css::Length * cssWidth;
+  ::gnu::javax::swing::text::html::css::Length * cssHeight;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_ParagraphView__
diff --git a/libjava/javax/swing/text/html/ResetableModel.h b/libjava/javax/swing/text/html/ResetableModel.h
new file mode 100644
index 000000000..f07a0ed9a
--- /dev/null
+++ b/libjava/javax/swing/text/html/ResetableModel.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_ResetableModel__
+#define __javax_swing_text_html_ResetableModel__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace html
+        {
+            class ResetableModel;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::ResetableModel : public ::java::lang::Object
+{
+
+public:
+  virtual void reset() = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_text_html_ResetableModel__
diff --git a/libjava/javax/swing/text/html/ResetablePlainDocument.h b/libjava/javax/swing/text/html/ResetablePlainDocument.h
new file mode 100644
index 000000000..31283e50b
--- /dev/null
+++ b/libjava/javax/swing/text/html/ResetablePlainDocument.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_ResetablePlainDocument__
+#define __javax_swing_text_html_ResetablePlainDocument__
+
+#pragma interface
+
+#include <javax/swing/text/PlainDocument.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace html
+        {
+            class ResetablePlainDocument;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::ResetablePlainDocument : public ::javax::swing::text::PlainDocument
+{
+
+public: // actually package-private
+  ResetablePlainDocument();
+  virtual void setInitialText(::java::lang::String *);
+public:
+  virtual void reset();
+private:
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::text::PlainDocument)))) initial;
+public: // actually package-private
+  static jboolean $assertionsDisabled;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_ResetablePlainDocument__
diff --git a/libjava/javax/swing/text/html/ResetableToggleButtonModel.h b/libjava/javax/swing/text/html/ResetableToggleButtonModel.h
new file mode 100644
index 000000000..13295225b
--- /dev/null
+++ b/libjava/javax/swing/text/html/ResetableToggleButtonModel.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_ResetableToggleButtonModel__
+#define __javax_swing_text_html_ResetableToggleButtonModel__
+
+#pragma interface
+
+#include <javax/swing/JToggleButton$ToggleButtonModel.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace html
+        {
+            class ResetableToggleButtonModel;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::ResetableToggleButtonModel : public ::javax::swing::JToggleButton$ToggleButtonModel
+{
+
+public: // actually package-private
+  ResetableToggleButtonModel();
+public:
+  virtual void setInitial(jboolean);
+  virtual void reset();
+private:
+  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JToggleButton$ToggleButtonModel)))) initial;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_ResetableToggleButtonModel__
diff --git a/libjava/javax/swing/text/html/SelectComboBoxModel.h b/libjava/javax/swing/text/html/SelectComboBoxModel.h
new file mode 100644
index 000000000..e9ae5c6fe
--- /dev/null
+++ b/libjava/javax/swing/text/html/SelectComboBoxModel.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_SelectComboBoxModel__
+#define __javax_swing_text_html_SelectComboBoxModel__
+
+#pragma interface
+
+#include <javax/swing/DefaultComboBoxModel.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace html
+        {
+            class Option;
+            class SelectComboBoxModel;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::SelectComboBoxModel : public ::javax::swing::DefaultComboBoxModel
+{
+
+public: // actually package-private
+  SelectComboBoxModel();
+  virtual void setInitialSelection(::javax::swing::text::html::Option *);
+  virtual ::javax::swing::text::html::Option * getInitialSelection();
+public:
+  virtual void reset();
+private:
+  ::javax::swing::text::html::Option * __attribute__((aligned(__alignof__( ::javax::swing::DefaultComboBoxModel)))) initial;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_SelectComboBoxModel__
diff --git a/libjava/javax/swing/text/html/SelectListModel.h b/libjava/javax/swing/text/html/SelectListModel.h
new file mode 100644
index 000000000..85ce6c3d4
--- /dev/null
+++ b/libjava/javax/swing/text/html/SelectListModel.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_SelectListModel__
+#define __javax_swing_text_html_SelectListModel__
+
+#pragma interface
+
+#include <javax/swing/DefaultListModel.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class DefaultListSelectionModel;
+        class ListSelectionModel;
+      namespace text
+      {
+        namespace html
+        {
+            class SelectListModel;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::SelectListModel : public ::javax::swing::DefaultListModel
+{
+
+public: // actually package-private
+  SelectListModel();
+  virtual void addInitialSelection(jint);
+public:
+  virtual void reset();
+public: // actually package-private
+  virtual ::javax::swing::ListSelectionModel * getSelectionModel();
+private:
+  ::javax::swing::DefaultListSelectionModel * __attribute__((aligned(__alignof__( ::javax::swing::DefaultListModel)))) selectionModel;
+  ::java::util::BitSet * initialSelection;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_SelectListModel__
diff --git a/libjava/javax/swing/text/html/StyleSheet$BoxPainter.h b/libjava/javax/swing/text/html/StyleSheet$BoxPainter.h
new file mode 100644
index 000000000..739686890
--- /dev/null
+++ b/libjava/javax/swing/text/html/StyleSheet$BoxPainter.h
@@ -0,0 +1,65 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_StyleSheet$BoxPainter__
+#define __javax_swing_text_html_StyleSheet$BoxPainter__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace border
+      {
+          class Border;
+      }
+      namespace text
+      {
+          class AttributeSet;
+          class View;
+        namespace html
+        {
+            class StyleSheet;
+            class StyleSheet$BoxPainter;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::StyleSheet$BoxPainter : public ::java::lang::Object
+{
+
+public: // actually package-private
+  StyleSheet$BoxPainter(::javax::swing::text::AttributeSet *, ::javax::swing::text::html::StyleSheet *);
+public:
+  virtual jfloat getInset(jint, ::javax::swing::text::View *);
+  virtual void paint(::java::awt::Graphics *, jfloat, jfloat, jfloat, jfloat, ::javax::swing::text::View *);
+private:
+  jfloat __attribute__((aligned(__alignof__( ::java::lang::Object)))) leftInset;
+  jfloat rightInset;
+  jfloat topInset;
+  jfloat bottomInset;
+  ::javax::swing::border::Border * border;
+  jfloat leftPadding;
+  jfloat rightPadding;
+  jfloat topPadding;
+  jfloat bottomPadding;
+  ::java::awt::Color * background;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_StyleSheet$BoxPainter__
diff --git a/libjava/javax/swing/text/html/StyleSheet$CSSStyle.h b/libjava/javax/swing/text/html/StyleSheet$CSSStyle.h
new file mode 100644
index 000000000..3266efd1c
--- /dev/null
+++ b/libjava/javax/swing/text/html/StyleSheet$CSSStyle.h
@@ -0,0 +1,77 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_StyleSheet$CSSStyle__
+#define __javax_swing_text_html_StyleSheet$CSSStyle__
+
+#pragma interface
+
+#include <javax/swing/text/SimpleAttributeSet.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace swing
+      {
+        namespace text
+        {
+          namespace html
+          {
+            namespace css
+            {
+                class Selector;
+            }
+          }
+        }
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class ChangeListener;
+      }
+      namespace text
+      {
+        namespace html
+        {
+            class StyleSheet;
+            class StyleSheet$CSSStyle;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::StyleSheet$CSSStyle : public ::javax::swing::text::SimpleAttributeSet
+{
+
+public: // actually package-private
+  StyleSheet$CSSStyle(::javax::swing::text::html::StyleSheet *, jint, ::gnu::javax::swing::text::html::css::Selector *);
+public:
+  virtual ::java::lang::String * getName();
+  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
+  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
+  virtual jint StyleSheet$CSSStyle$compareTo(::javax::swing::text::html::StyleSheet$CSSStyle *);
+  virtual jint compareTo(::java::lang::Object *);
+public: // actually package-private
+  static const jint PREC_UA = 0;
+  static const jint PREC_NORM = 100000;
+  static const jint PREC_AUTHOR_NORMAL = 200000;
+  static const jint PREC_AUTHOR_IMPORTANT = 300000;
+  static const jint PREC_USER_IMPORTANT = 400000;
+private:
+  jint __attribute__((aligned(__alignof__( ::javax::swing::text::SimpleAttributeSet)))) precedence;
+public: // actually package-private
+  ::gnu::javax::swing::text::html::css::Selector * selector;
+  ::javax::swing::text::html::StyleSheet * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_StyleSheet$CSSStyle__
diff --git a/libjava/javax/swing/text/html/StyleSheet$CSSStyleSheetParserCallback.h b/libjava/javax/swing/text/html/StyleSheet$CSSStyleSheetParserCallback.h
new file mode 100644
index 000000000..43c581378
--- /dev/null
+++ b/libjava/javax/swing/text/html/StyleSheet$CSSStyleSheetParserCallback.h
@@ -0,0 +1,68 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_StyleSheet$CSSStyleSheetParserCallback__
+#define __javax_swing_text_html_StyleSheet$CSSStyleSheetParserCallback__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace swing
+      {
+        namespace text
+        {
+          namespace html
+          {
+            namespace css
+            {
+                class Selector;
+            }
+          }
+        }
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace html
+        {
+            class StyleSheet;
+            class StyleSheet$CSSStyle;
+            class StyleSheet$CSSStyleSheetParserCallback;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::StyleSheet$CSSStyleSheetParserCallback : public ::java::lang::Object
+{
+
+public: // actually package-private
+  StyleSheet$CSSStyleSheetParserCallback(::javax::swing::text::html::StyleSheet *, jint);
+public:
+  virtual void startStatement(JArray< ::gnu::javax::swing::text::html::css::Selector * > *);
+  virtual void endStatement();
+  virtual void declaration(::java::lang::String *, ::java::lang::String *);
+private:
+  JArray< ::javax::swing::text::html::StyleSheet$CSSStyle * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) styles;
+  jint precedence;
+public: // actually package-private
+  ::javax::swing::text::html::StyleSheet * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_StyleSheet$CSSStyleSheetParserCallback__
diff --git a/libjava/javax/swing/text/html/StyleSheet$ListPainter.h b/libjava/javax/swing/text/html/StyleSheet$ListPainter.h
new file mode 100644
index 000000000..d910fc0d3
--- /dev/null
+++ b/libjava/javax/swing/text/html/StyleSheet$ListPainter.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_StyleSheet$ListPainter__
+#define __javax_swing_text_html_StyleSheet$ListPainter__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AttributeSet;
+          class View;
+        namespace html
+        {
+            class StyleSheet;
+            class StyleSheet$ListPainter;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::StyleSheet$ListPainter : public ::java::lang::Object
+{
+
+public: // actually package-private
+  StyleSheet$ListPainter(::javax::swing::text::AttributeSet *, ::javax::swing::text::html::StyleSheet *);
+public:
+  virtual void paint(::java::awt::Graphics *, jfloat, jfloat, jfloat, jfloat, ::javax::swing::text::View *, jint);
+private:
+  ::javax::swing::text::AttributeSet * __attribute__((aligned(__alignof__( ::java::lang::Object)))) attributes;
+  ::javax::swing::text::html::StyleSheet * styleSheet;
+  ::java::lang::String * type;
+  ::java::awt::Rectangle * tmpRect;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_StyleSheet$ListPainter__
diff --git a/libjava/javax/swing/text/html/StyleSheet.h b/libjava/javax/swing/text/html/StyleSheet.h
new file mode 100644
index 000000000..57ebf9e3b
--- /dev/null
+++ b/libjava/javax/swing/text/html/StyleSheet.h
@@ -0,0 +1,121 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_StyleSheet__
+#define __javax_swing_text_html_StyleSheet__
+
+#pragma interface
+
+#include <javax/swing/text/StyleContext.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Font;
+    }
+    namespace net
+    {
+        class URL;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AttributeSet;
+          class Element;
+          class MutableAttributeSet;
+          class Style;
+          class StyleContext$SmallAttributeSet;
+          class View;
+        namespace html
+        {
+            class CSS$Attribute;
+            class HTML$Tag;
+            class StyleSheet;
+            class StyleSheet$BoxPainter;
+            class StyleSheet$ListPainter;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::StyleSheet : public ::javax::swing::text::StyleContext
+{
+
+public:
+  StyleSheet();
+  virtual ::javax::swing::text::Style * getRule(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::Element *);
+private:
+  ::javax::swing::text::Style * getResolvedStyle(::java::lang::String *, ::java::util::List *, ::javax::swing::text::html::HTML$Tag *);
+  ::javax::swing::text::Style * resolveStyle(::java::lang::String *, ::java::util::List *, ::javax::swing::text::html::HTML$Tag *);
+  ::javax::swing::text::Style * resolveStyle(::java::lang::String *, JArray< ::java::lang::String * > *, ::java::util::List *);
+public:
+  virtual ::javax::swing::text::Style * getRule(::java::lang::String *);
+  virtual void addRule(::java::lang::String *);
+  virtual ::javax::swing::text::AttributeSet * getDeclaration(::java::lang::String *);
+  virtual void loadRules(::java::io::Reader *, ::java::net::URL *);
+  virtual ::javax::swing::text::AttributeSet * getViewAttributes(::javax::swing::text::View *);
+  virtual void removeStyle(::java::lang::String *);
+  virtual void addStyleSheet(::javax::swing::text::html::StyleSheet *);
+  virtual void removeStyleSheet(::javax::swing::text::html::StyleSheet *);
+  virtual JArray< ::javax::swing::text::html::StyleSheet * > * getStyleSheets();
+  virtual void importStyleSheet(::java::net::URL *);
+  virtual void setBase(::java::net::URL *);
+  virtual ::java::net::URL * getBase();
+  virtual void addCSSAttribute(::javax::swing::text::MutableAttributeSet *, ::javax::swing::text::html::CSS$Attribute *, ::java::lang::String *);
+  virtual jboolean addCSSAttributeFromHTML(::javax::swing::text::MutableAttributeSet *, ::javax::swing::text::html::CSS$Attribute *, ::java::lang::String *);
+  virtual ::javax::swing::text::AttributeSet * translateHTMLToCSS(::javax::swing::text::AttributeSet *);
+private:
+  ::javax::swing::text::AttributeSet * translateBorder(::javax::swing::text::AttributeSet *, ::java::lang::Object *);
+public:
+  virtual ::javax::swing::text::AttributeSet * addAttribute(::javax::swing::text::AttributeSet *, ::java::lang::Object *, ::java::lang::Object *);
+  virtual ::javax::swing::text::AttributeSet * addAttributes(::javax::swing::text::AttributeSet *, ::javax::swing::text::AttributeSet *);
+  virtual ::javax::swing::text::AttributeSet * removeAttribute(::javax::swing::text::AttributeSet *, ::java::lang::Object *);
+  virtual ::javax::swing::text::AttributeSet * removeAttributes(::javax::swing::text::AttributeSet *, ::javax::swing::text::AttributeSet *);
+  virtual ::javax::swing::text::AttributeSet * removeAttributes(::javax::swing::text::AttributeSet *, ::java::util::Enumeration *);
+public: // actually protected
+  virtual ::javax::swing::text::StyleContext$SmallAttributeSet * createSmallAttributeSet(::javax::swing::text::AttributeSet *);
+  virtual ::javax::swing::text::MutableAttributeSet * createLargeAttributeSet(::javax::swing::text::AttributeSet *);
+public:
+  virtual ::java::awt::Font * getFont(::javax::swing::text::AttributeSet *);
+public: // actually package-private
+  virtual jfloat getEMBase(::javax::swing::text::AttributeSet *);
+  virtual jfloat getEXBase(::javax::swing::text::AttributeSet *);
+private:
+  jint getFontSize(::javax::swing::text::AttributeSet *);
+public:
+  virtual ::java::awt::Color * getForeground(::javax::swing::text::AttributeSet *);
+  virtual ::java::awt::Color * getBackground(::javax::swing::text::AttributeSet *);
+  virtual ::javax::swing::text::html::StyleSheet$BoxPainter * getBoxPainter(::javax::swing::text::AttributeSet *);
+  virtual ::javax::swing::text::html::StyleSheet$ListPainter * getListPainter(::javax::swing::text::AttributeSet *);
+  virtual void setBaseFontSize(jint);
+  virtual void setBaseFontSize(::java::lang::String *);
+  static jint getIndexOfSize(jfloat);
+  virtual jfloat getPointSize(jint);
+  virtual jfloat getPointSize(::java::lang::String *);
+  virtual ::java::awt::Color * stringToColor(::java::lang::String *);
+private:
+  ::java::util::Map * attributeSetToMap(::javax::swing::text::AttributeSet *);
+public: // actually package-private
+  ::java::net::URL * __attribute__((aligned(__alignof__( ::javax::swing::text::StyleContext)))) base;
+  jint baseFontSize;
+private:
+  ::java::util::ArrayList * linked;
+public: // actually package-private
+  ::java::util::ArrayList * css;
+private:
+  ::java::util::HashMap * resolvedStyles;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_StyleSheet__
diff --git a/libjava/javax/swing/text/html/TableView$CellView.h b/libjava/javax/swing/text/html/TableView$CellView.h
new file mode 100644
index 000000000..c878fa60a
--- /dev/null
+++ b/libjava/javax/swing/text/html/TableView$CellView.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_TableView$CellView__
+#define __javax_swing_text_html_TableView$CellView__
+
+#pragma interface
+
+#include <javax/swing/text/html/BlockView.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class SizeRequirements;
+      namespace text
+      {
+          class Element;
+        namespace html
+        {
+            class TableView;
+            class TableView$CellView;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::TableView$CellView : public ::javax::swing::text::html::BlockView
+{
+
+public: // actually package-private
+  TableView$CellView(::javax::swing::text::html::TableView *, ::javax::swing::text::Element *);
+public: // actually protected
+  virtual ::javax::swing::SizeRequirements * calculateMajorAxisRequirements(jint, ::javax::swing::SizeRequirements *);
+  virtual void setPropertiesFromAttributes();
+public: // actually package-private
+  jint __attribute__((aligned(__alignof__( ::javax::swing::text::html::BlockView)))) colSpan;
+  jint rowSpan;
+  ::javax::swing::text::html::TableView * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_TableView$CellView__
diff --git a/libjava/javax/swing/text/html/TableView$RowView.h b/libjava/javax/swing/text/html/TableView$RowView.h
new file mode 100644
index 000000000..f031898c1
--- /dev/null
+++ b/libjava/javax/swing/text/html/TableView$RowView.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_TableView$RowView__
+#define __javax_swing_text_html_TableView$RowView__
+
+#pragma interface
+
+#include <javax/swing/text/html/BlockView.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+        class SizeRequirements;
+      namespace text
+      {
+          class Element;
+          class View;
+        namespace html
+        {
+            class TableView;
+            class TableView$RowView;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::TableView$RowView : public ::javax::swing::text::html::BlockView
+{
+
+public: // actually package-private
+  TableView$RowView(::javax::swing::text::html::TableView *, ::javax::swing::text::Element *);
+public:
+  virtual void replace(jint, jint, JArray< ::javax::swing::text::View * > *);
+  virtual jfloat getMaximumSpan(jint);
+  virtual jfloat getMinimumSpan(jint);
+  virtual jfloat getPreferredSpan(jint);
+public: // actually protected
+  virtual ::javax::swing::SizeRequirements * calculateMajorAxisRequirements(jint, ::javax::swing::SizeRequirements *);
+  virtual void layoutMinorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
+  virtual void layoutMajorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
+public: // actually package-private
+  JArray< jboolean > * __attribute__((aligned(__alignof__( ::javax::swing::text::html::BlockView)))) overlap;
+  jint rowIndex;
+  ::javax::swing::text::html::TableView * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_TableView$RowView__
diff --git a/libjava/javax/swing/text/html/TableView.h b/libjava/javax/swing/text/html/TableView.h
new file mode 100644
index 000000000..b271a4e48
--- /dev/null
+++ b/libjava/javax/swing/text/html/TableView.h
@@ -0,0 +1,119 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_TableView__
+#define __javax_swing_text_html_TableView__
+
+#pragma interface
+
+#include <javax/swing/text/html/BlockView.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace swing
+      {
+        namespace text
+        {
+          namespace html
+          {
+            namespace css
+            {
+                class Length;
+            }
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace awt
+    {
+        class Graphics;
+        class Rectangle;
+        class Shape;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class SizeRequirements;
+      namespace event
+      {
+          class DocumentEvent;
+      }
+      namespace text
+      {
+          class AttributeSet;
+          class Element;
+          class View;
+          class ViewFactory;
+        namespace html
+        {
+            class StyleSheet;
+            class TableView;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::TableView : public ::javax::swing::text::html::BlockView
+{
+
+public:
+  TableView(::javax::swing::text::Element *);
+  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *);
+  virtual ::javax::swing::text::ViewFactory * getViewFactory();
+  virtual ::javax::swing::text::AttributeSet * getAttributes();
+public: // actually protected
+  virtual ::javax::swing::text::html::StyleSheet * getStyleSheet();
+  virtual ::javax::swing::SizeRequirements * calculateMinorAxisRequirements(jint, ::javax::swing::SizeRequirements *);
+  virtual void layoutMinorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
+private:
+  void calculateColumnRequirements();
+  void layoutColumns(jint);
+public: // actually package-private
+  virtual void updateGrid();
+public:
+  virtual jfloat getMaximumSpan(jint);
+  virtual void setParent(::javax::swing::text::View *);
+public: // actually protected
+  virtual void setPropertiesFromAttributes();
+  virtual ::javax::swing::SizeRequirements * calculateMajorAxisRequirements(jint, ::javax::swing::SizeRequirements *);
+  virtual void layoutMajorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
+public:
+  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
+  virtual void replace(jint, jint, JArray< ::javax::swing::text::View * > *);
+  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
+public: // actually package-private
+  static jint access$0(::javax::swing::text::html::TableView *, jint, jint);
+private:
+  ::javax::swing::text::AttributeSet * __attribute__((aligned(__alignof__( ::javax::swing::text::html::BlockView)))) attributes;
+public: // actually package-private
+  JArray< ::javax::swing::SizeRequirements * > * columnRequirements;
+  ::javax::swing::SizeRequirements * totalColumnRequirements;
+  JArray< jint > * columnOffsets;
+  JArray< jint > * columnSpans;
+  JArray< ::gnu::javax::swing::text::html::css::Length * > * columnWidths;
+  jint numColumns;
+private:
+  ::gnu::javax::swing::text::html::css::Length * width;
+public: // actually package-private
+  jboolean gridValid;
+  jint cellSpacing;
+private:
+  ::java::awt::Rectangle * tmpRect;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_TableView__
diff --git a/libjava/javax/swing/text/html/ViewAttributeSet.h b/libjava/javax/swing/text/html/ViewAttributeSet.h
new file mode 100644
index 000000000..be6ecdcba
--- /dev/null
+++ b/libjava/javax/swing/text/html/ViewAttributeSet.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_ViewAttributeSet__
+#define __javax_swing_text_html_ViewAttributeSet__
+
+#pragma interface
+
+#include <javax/swing/text/html/MultiAttributeSet.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class AttributeSet;
+          class View;
+        namespace html
+        {
+            class StyleSheet;
+            class ViewAttributeSet;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::ViewAttributeSet : public ::javax::swing::text::html::MultiAttributeSet
+{
+
+public: // actually package-private
+  ViewAttributeSet(::javax::swing::text::View *, ::javax::swing::text::html::StyleSheet *);
+public:
+  virtual ::java::lang::Object * getAttribute(::java::lang::Object *);
+  virtual ::javax::swing::text::AttributeSet * getResolveParent();
+private:
+  ::javax::swing::text::View * __attribute__((aligned(__alignof__( ::javax::swing::text::html::MultiAttributeSet)))) view;
+  ::javax::swing::text::html::StyleSheet * styleSheet;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_ViewAttributeSet__
diff --git a/libjava/javax/swing/text/html/parser/AttributeList$1.h b/libjava/javax/swing/text/html/parser/AttributeList$1.h
new file mode 100644
index 000000000..64d273a8c
--- /dev/null
+++ b/libjava/javax/swing/text/html/parser/AttributeList$1.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_parser_AttributeList$1__
+#define __javax_swing_text_html_parser_AttributeList$1__
+
+#pragma interface
+
+#include <gnu/javax/swing/text/html/parser/support/gnuStringIntMapper.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace html
+        {
+          namespace parser
+          {
+              class AttributeList$1;
+          }
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::parser::AttributeList$1 : public ::gnu::javax::swing::text::html::parser::support::gnuStringIntMapper
+{
+
+public: // actually package-private
+  AttributeList$1();
+public: // actually protected
+  virtual void create();
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_parser_AttributeList$1__
diff --git a/libjava/javax/swing/text/html/parser/AttributeList.h b/libjava/javax/swing/text/html/parser/AttributeList.h
new file mode 100644
index 000000000..b7fb6475f
--- /dev/null
+++ b/libjava/javax/swing/text/html/parser/AttributeList.h
@@ -0,0 +1,80 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_parser_AttributeList__
+#define __javax_swing_text_html_parser_AttributeList__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace swing
+      {
+        namespace text
+        {
+          namespace html
+          {
+            namespace parser
+            {
+              namespace support
+              {
+                  class gnuStringIntMapper;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace html
+        {
+          namespace parser
+          {
+              class AttributeList;
+          }
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::parser::AttributeList : public ::java::lang::Object
+{
+
+public:
+  AttributeList(::java::lang::String *);
+  AttributeList(::java::lang::String *, jint, jint, ::java::lang::String *, ::java::util::Vector *, ::javax::swing::text::html::parser::AttributeList *);
+  jint getModifier();
+  ::java::lang::String * getName();
+  ::javax::swing::text::html::parser::AttributeList * getNext();
+  jint getType();
+  ::java::lang::String * getValue();
+  ::java::util::Enumeration * getValues();
+  static jint name2type(::java::lang::String *);
+  ::java::lang::String * toString();
+  static ::java::lang::String * type2name(jint);
+private:
+  static ::gnu::javax::swing::text::html::parser::support::gnuStringIntMapper * mapper;
+  static const jlong serialVersionUID = -1361214058742015233LL;
+public:
+  ::javax::swing::text::html::parser::AttributeList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) next;
+  ::java::lang::String * name;
+  ::java::lang::String * value;
+  ::java::util::Vector * values;
+  jint modifier;
+  jint type;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_parser_AttributeList__
diff --git a/libjava/javax/swing/text/html/parser/ContentModel.h b/libjava/javax/swing/text/html/parser/ContentModel.h
new file mode 100644
index 000000000..45f3b20b2
--- /dev/null
+++ b/libjava/javax/swing/text/html/parser/ContentModel.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_parser_ContentModel__
+#define __javax_swing_text_html_parser_ContentModel__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace html
+        {
+          namespace parser
+          {
+              class ContentModel;
+              class Element;
+          }
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::parser::ContentModel : public ::java::lang::Object
+{
+
+public:
+  ContentModel();
+  ContentModel(::javax::swing::text::html::parser::Element *);
+  ContentModel(jint, ::javax::swing::text::html::parser::ContentModel *);
+  ContentModel(jint, ::java::lang::Object *, ::javax::swing::text::html::parser::ContentModel *);
+  void getElements(::java::util::Vector *);
+  jboolean empty();
+  ::javax::swing::text::html::parser::Element * first();
+  jboolean first(::java::lang::Object *);
+  ::java::lang::String * toString();
+private:
+  static const jlong serialVersionUID = -1130825523866321257LL;
+public:
+  ::javax::swing::text::html::parser::ContentModel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) next;
+  ::java::lang::Object * content;
+  jint type;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_parser_ContentModel__
diff --git a/libjava/javax/swing/text/html/parser/DTD.h b/libjava/javax/swing/text/html/parser/DTD.h
new file mode 100644
index 000000000..f9933273e
--- /dev/null
+++ b/libjava/javax/swing/text/html/parser/DTD.h
@@ -0,0 +1,89 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_parser_DTD__
+#define __javax_swing_text_html_parser_DTD__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace html
+        {
+          namespace parser
+          {
+              class AttributeList;
+              class ContentModel;
+              class DTD;
+              class Element;
+              class Entity;
+          }
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::parser::DTD : public ::java::lang::Object
+{
+
+public: // actually protected
+  DTD(::java::lang::String *);
+public:
+  static ::javax::swing::text::html::parser::DTD * getDTD(::java::lang::String *);
+  virtual ::javax::swing::text::html::parser::Element * getElement(::java::lang::String *);
+  virtual ::javax::swing::text::html::parser::Element * getElement(jint);
+  virtual ::javax::swing::text::html::parser::Entity * getEntity(jint);
+  virtual ::javax::swing::text::html::parser::Entity * getEntity(::java::lang::String *);
+  virtual ::java::lang::String * getName();
+  virtual ::javax::swing::text::html::parser::Entity * defEntity(::java::lang::String *, jint, jint);
+  virtual void defineAttributes(::java::lang::String *, ::javax::swing::text::html::parser::AttributeList *);
+  virtual ::javax::swing::text::html::parser::Element * defineElement(::java::lang::String *, jint, jboolean, jboolean, ::javax::swing::text::html::parser::ContentModel *, ::java::util::BitSet *, ::java::util::BitSet *, ::javax::swing::text::html::parser::AttributeList *);
+  virtual ::javax::swing::text::html::parser::Entity * defineEntity(::java::lang::String *, jint, JArray< jchar > *);
+  static void putDTDHash(::java::lang::String *, ::javax::swing::text::html::parser::DTD *);
+  virtual void read(::java::io::DataInputStream *);
+  virtual ::java::lang::String * toString();
+public: // actually protected
+  virtual ::javax::swing::text::html::parser::AttributeList * defAttributeList(::java::lang::String *, jint, jint, ::java::lang::String *, ::java::lang::String *, ::javax::swing::text::html::parser::AttributeList *);
+  virtual ::javax::swing::text::html::parser::ContentModel * defContentModel(jint, ::java::lang::Object *, ::javax::swing::text::html::parser::ContentModel *);
+  virtual ::javax::swing::text::html::parser::Element * defElement(::java::lang::String *, jint, jboolean, jboolean, ::javax::swing::text::html::parser::ContentModel *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, ::javax::swing::text::html::parser::AttributeList *);
+  virtual ::javax::swing::text::html::parser::Entity * defEntity(::java::lang::String *, jint, ::java::lang::String *);
+private:
+  void assignField(::javax::swing::text::html::parser::Element *);
+  ::java::util::BitSet * bitSet(JArray< ::java::lang::String * > *);
+  ::javax::swing::text::html::parser::Element * newElement(::java::lang::String *);
+  ::javax::swing::text::html::parser::Entity * newEntity(::java::lang::String *, jint);
+  void unexpected(::java::lang::Exception *);
+public:
+  static const jint FILE_VERSION = 1;
+public: // actually package-private
+  static ::java::util::Hashtable * dtdHash;
+public:
+  ::javax::swing::text::html::parser::Element * __attribute__((aligned(__alignof__( ::java::lang::Object)))) applet;
+  ::javax::swing::text::html::parser::Element * base;
+  ::javax::swing::text::html::parser::Element * body;
+  ::javax::swing::text::html::parser::Element * head;
+  ::javax::swing::text::html::parser::Element * html;
+  ::javax::swing::text::html::parser::Element * isindex;
+  ::javax::swing::text::html::parser::Element * meta;
+  ::javax::swing::text::html::parser::Element * p;
+  ::javax::swing::text::html::parser::Element * param;
+  ::javax::swing::text::html::parser::Element * pcdata;
+  ::javax::swing::text::html::parser::Element * title;
+  ::java::util::Hashtable * elementHash;
+  ::java::util::Hashtable * entityHash;
+  ::java::lang::String * name;
+  ::java::util::Vector * elements;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_parser_DTD__
diff --git a/libjava/javax/swing/text/html/parser/DTDConstants.h b/libjava/javax/swing/text/html/parser/DTDConstants.h
new file mode 100644
index 000000000..7fe66c6de
--- /dev/null
+++ b/libjava/javax/swing/text/html/parser/DTDConstants.h
@@ -0,0 +1,72 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_parser_DTDConstants__
+#define __javax_swing_text_html_parser_DTDConstants__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace html
+        {
+          namespace parser
+          {
+              class DTDConstants;
+          }
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::parser::DTDConstants : public ::java::lang::Object
+{
+
+public:
+  static const jint CDATA = 1;
+  static const jint EMPTY = 17;
+  static const jint ID = 4;
+  static const jint IDREF = 5;
+  static const jint IDREFS = 6;
+  static const jint NAME = 7;
+  static const jint NAMES = 8;
+  static const jint NMTOKEN = 9;
+  static const jint NMTOKENS = 10;
+  static const jint NOTATION = 11;
+  static const jint NUMBER = 12;
+  static const jint NUMBERS = 13;
+  static const jint NUTOKEN = 14;
+  static const jint NUTOKENS = 15;
+  static const jint PUBLIC = 10;
+  static const jint SYSTEM = 17;
+  static const jint PARAMETER = 262144;
+  static const jint GENERAL = 65536;
+  static const jint REQUIRED = 2;
+  static const jint FIXED = 1;
+  static const jint IMPLIED = 5;
+  static const jint CURRENT = 3;
+  static const jint CONREF = 4;
+  static const jint STARTTAG = 13;
+  static const jint ENDTAG = 14;
+  static const jint ANY = 19;
+  static const jint DEFAULT = 131072;
+  static const jint ENTITIES = 3;
+  static const jint ENTITY = 2;
+  static const jint MD = 16;
+  static const jint MODEL = 18;
+  static const jint MS = 15;
+  static const jint PI = 12;
+  static const jint RCDATA = 16;
+  static const jint SDATA = 11;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_text_html_parser_DTDConstants__
diff --git a/libjava/javax/swing/text/html/parser/DocumentParser$gnuParser.h b/libjava/javax/swing/text/html/parser/DocumentParser$gnuParser.h
new file mode 100644
index 000000000..cba941dcf
--- /dev/null
+++ b/libjava/javax/swing/text/html/parser/DocumentParser$gnuParser.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_parser_DocumentParser$gnuParser__
+#define __javax_swing_text_html_parser_DocumentParser$gnuParser__
+
+#pragma interface
+
+#include <gnu/javax/swing/text/html/parser/support/Parser.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace html
+        {
+          namespace parser
+          {
+              class DTD;
+              class DocumentParser;
+              class DocumentParser$gnuParser;
+              class TagElement;
+          }
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::parser::DocumentParser$gnuParser : public ::gnu::javax::swing::text::html::parser::support::Parser
+{
+
+  DocumentParser$gnuParser(::javax::swing::text::html::parser::DocumentParser *, ::javax::swing::text::html::parser::DTD *);
+public: // actually protected
+  virtual void handleComment(JArray< jchar > *);
+  virtual void handleEmptyTag(::javax::swing::text::html::parser::TagElement *);
+  virtual void handleEndTag(::javax::swing::text::html::parser::TagElement *);
+  virtual void handleError(jint, ::java::lang::String *);
+  virtual void handleStartTag(::javax::swing::text::html::parser::TagElement *);
+  virtual void handleText(JArray< jchar > *);
+public: // actually package-private
+  virtual ::javax::swing::text::html::parser::DTD * getDTD();
+  DocumentParser$gnuParser(::javax::swing::text::html::parser::DocumentParser *, ::javax::swing::text::html::parser::DTD *, ::javax::swing::text::html::parser::DocumentParser$gnuParser *);
+  ::javax::swing::text::html::parser::DocumentParser * __attribute__((aligned(__alignof__( ::gnu::javax::swing::text::html::parser::support::Parser)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_parser_DocumentParser$gnuParser__
diff --git a/libjava/javax/swing/text/html/parser/DocumentParser.h b/libjava/javax/swing/text/html/parser/DocumentParser.h
new file mode 100644
index 000000000..d07191d19
--- /dev/null
+++ b/libjava/javax/swing/text/html/parser/DocumentParser.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_parser_DocumentParser__
+#define __javax_swing_text_html_parser_DocumentParser__
+
+#pragma interface
+
+#include <javax/swing/text/html/parser/Parser.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace html
+        {
+            class HTMLEditorKit$ParserCallback;
+          namespace parser
+          {
+              class DTD;
+              class DocumentParser;
+              class DocumentParser$gnuParser;
+              class TagElement;
+          }
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::parser::DocumentParser : public ::javax::swing::text::html::parser::Parser
+{
+
+public:
+  DocumentParser(::javax::swing::text::html::parser::DTD *);
+  virtual void parse(::java::io::Reader *, ::javax::swing::text::html::HTMLEditorKit$ParserCallback *, jboolean);
+public: // actually protected
+  virtual void handleComment(JArray< jchar > *);
+  virtual void handleEmptyTag(::javax::swing::text::html::parser::TagElement *);
+  virtual void handleEndTag(::javax::swing::text::html::parser::TagElement *);
+  virtual void handleError(jint, ::java::lang::String *);
+  virtual void handleStartTag(::javax::swing::text::html::parser::TagElement *);
+  virtual void handleText(JArray< jchar > *);
+public: // actually package-private
+  ::javax::swing::text::html::parser::DocumentParser * __attribute__((aligned(__alignof__( ::javax::swing::text::html::parser::Parser)))) parser;
+  ::javax::swing::text::html::HTMLEditorKit$ParserCallback * callBack;
+  ::javax::swing::text::html::parser::DocumentParser$gnuParser * gnu;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_parser_DocumentParser__
diff --git a/libjava/javax/swing/text/html/parser/Element$1.h b/libjava/javax/swing/text/html/parser/Element$1.h
new file mode 100644
index 000000000..159f9976f
--- /dev/null
+++ b/libjava/javax/swing/text/html/parser/Element$1.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_parser_Element$1__
+#define __javax_swing_text_html_parser_Element$1__
+
+#pragma interface
+
+#include <gnu/javax/swing/text/html/parser/support/gnuStringIntMapper.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace html
+        {
+          namespace parser
+          {
+              class Element$1;
+          }
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::parser::Element$1 : public ::gnu::javax::swing::text::html::parser::support::gnuStringIntMapper
+{
+
+public: // actually package-private
+  Element$1();
+public: // actually protected
+  virtual void create();
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_parser_Element$1__
diff --git a/libjava/javax/swing/text/html/parser/Element.h b/libjava/javax/swing/text/html/parser/Element.h
new file mode 100644
index 000000000..08bc75c7a
--- /dev/null
+++ b/libjava/javax/swing/text/html/parser/Element.h
@@ -0,0 +1,90 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_parser_Element__
+#define __javax_swing_text_html_parser_Element__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace swing
+      {
+        namespace text
+        {
+          namespace html
+          {
+            namespace parser
+            {
+              namespace support
+              {
+                  class gnuStringIntMapper;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace html
+        {
+          namespace parser
+          {
+              class AttributeList;
+              class ContentModel;
+              class Element;
+          }
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::parser::Element : public ::java::lang::Object
+{
+
+public: // actually package-private
+  Element();
+public:
+  static jint name2type(::java::lang::String *);
+  ::javax::swing::text::html::parser::AttributeList * getAttribute(::java::lang::String *);
+  ::javax::swing::text::html::parser::AttributeList * getAttributeByValue(::java::lang::String *);
+  ::javax::swing::text::html::parser::AttributeList * getAttributes();
+  ::javax::swing::text::html::parser::ContentModel * getContent();
+  jboolean isEmpty();
+  jint getIndex();
+  ::java::lang::String * getName();
+  jint getType();
+  jboolean omitEnd();
+  jboolean omitStart();
+  ::java::lang::String * toString();
+public: // actually package-private
+  static ::gnu::javax::swing::text::html::parser::support::gnuStringIntMapper * mapper;
+private:
+  static const jlong serialVersionUID = -6717939384601675586LL;
+public:
+  ::javax::swing::text::html::parser::AttributeList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) atts;
+  ::java::util::BitSet * exclusions;
+  ::java::util::BitSet * inclusions;
+  ::javax::swing::text::html::parser::ContentModel * content;
+  ::java::lang::Object * data;
+  ::java::lang::String * name;
+  jboolean oEnd;
+  jboolean oStart;
+  jint index;
+  jint type;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_parser_Element__
diff --git a/libjava/javax/swing/text/html/parser/Entity$1.h b/libjava/javax/swing/text/html/parser/Entity$1.h
new file mode 100644
index 000000000..ed86ad36e
--- /dev/null
+++ b/libjava/javax/swing/text/html/parser/Entity$1.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_parser_Entity$1__
+#define __javax_swing_text_html_parser_Entity$1__
+
+#pragma interface
+
+#include <gnu/javax/swing/text/html/parser/support/gnuStringIntMapper.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace html
+        {
+          namespace parser
+          {
+              class Entity$1;
+          }
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::parser::Entity$1 : public ::gnu::javax::swing::text::html::parser::support::gnuStringIntMapper
+{
+
+public: // actually package-private
+  Entity$1();
+public: // actually protected
+  virtual void create();
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_parser_Entity$1__
diff --git a/libjava/javax/swing/text/html/parser/Entity.h b/libjava/javax/swing/text/html/parser/Entity.h
new file mode 100644
index 000000000..2c82e3167
--- /dev/null
+++ b/libjava/javax/swing/text/html/parser/Entity.h
@@ -0,0 +1,78 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_parser_Entity__
+#define __javax_swing_text_html_parser_Entity__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace swing
+      {
+        namespace text
+        {
+          namespace html
+          {
+            namespace parser
+            {
+              namespace support
+              {
+                  class gnuStringIntMapper;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace html
+        {
+          namespace parser
+          {
+              class Entity;
+          }
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::parser::Entity : public ::java::lang::Object
+{
+
+public:
+  Entity(::java::lang::String *, jint, JArray< jchar > *);
+  static jint name2type(::java::lang::String *);
+  JArray< jchar > * getData();
+  jboolean isGeneral();
+  ::java::lang::String * getName();
+  jboolean isParameter();
+  ::java::lang::String * getString();
+  jint getType();
+public: // actually package-private
+  static ::gnu::javax::swing::text::html::parser::support::gnuStringIntMapper * mapper;
+public:
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
+  JArray< jchar > * data;
+  jint type;
+private:
+  ::java::lang::String * sdata;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_parser_Entity__
diff --git a/libjava/javax/swing/text/html/parser/Parser$1.h b/libjava/javax/swing/text/html/parser/Parser$1.h
new file mode 100644
index 000000000..fbeea85ca
--- /dev/null
+++ b/libjava/javax/swing/text/html/parser/Parser$1.h
@@ -0,0 +1,63 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_parser_Parser$1__
+#define __javax_swing_text_html_parser_Parser$1__
+
+#pragma interface
+
+#include <gnu/javax/swing/text/html/parser/support/Parser.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace html
+        {
+          namespace parser
+          {
+              class DTD;
+              class Element;
+              class Parser;
+              class Parser$1;
+              class TagElement;
+          }
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::parser::Parser$1 : public ::gnu::javax::swing::text::html::parser::support::Parser
+{
+
+public: // actually package-private
+  Parser$1(::javax::swing::text::html::parser::Parser *, ::javax::swing::text::html::parser::DTD *, ::javax::swing::text::html::parser::Parser *);
+public: // actually protected
+  virtual void handleComment(JArray< jchar > *);
+  virtual void handleEOFInComment();
+  virtual void handleEmptyTag(::javax::swing::text::html::parser::TagElement *);
+  virtual void handleStartTag(::javax::swing::text::html::parser::TagElement *);
+  virtual void handleEndTag(::javax::swing::text::html::parser::TagElement *);
+  virtual void handleError(jint, ::java::lang::String *);
+  virtual void handleText(JArray< jchar > *);
+  virtual void handleTitle(JArray< jchar > *);
+  virtual void markFirstTime(::javax::swing::text::html::parser::Element *);
+  virtual void startTag(::javax::swing::text::html::parser::TagElement *);
+  virtual void endTag(jboolean);
+  virtual ::javax::swing::text::html::parser::TagElement * makeTag(::javax::swing::text::html::parser::Element *);
+  virtual ::javax::swing::text::html::parser::TagElement * makeTag(::javax::swing::text::html::parser::Element *, jboolean);
+public: // actually package-private
+  ::javax::swing::text::html::parser::Parser * __attribute__((aligned(__alignof__( ::gnu::javax::swing::text::html::parser::support::Parser)))) this$0;
+private:
+  ::javax::swing::text::html::parser::Parser * val$j;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_parser_Parser$1__
diff --git a/libjava/javax/swing/text/html/parser/Parser.h b/libjava/javax/swing/text/html/parser/Parser.h
new file mode 100644
index 000000000..5f8e0dbab
--- /dev/null
+++ b/libjava/javax/swing/text/html/parser/Parser.h
@@ -0,0 +1,96 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_parser_Parser__
+#define __javax_swing_text_html_parser_Parser__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace swing
+      {
+        namespace text
+        {
+          namespace html
+          {
+            namespace parser
+            {
+              namespace support
+              {
+                  class Parser;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class SimpleAttributeSet;
+        namespace html
+        {
+          namespace parser
+          {
+              class DTD;
+              class Element;
+              class Parser;
+              class TagElement;
+          }
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::parser::Parser : public ::java::lang::Object
+{
+
+public:
+  Parser(::javax::swing::text::html::parser::DTD *);
+  virtual void parse(::java::io::Reader *);
+  virtual ::java::lang::String * parseDTDMarkup();
+public: // actually protected
+  virtual jboolean parseMarkupDeclarations(::java::lang::StringBuffer *);
+  virtual ::javax::swing::text::SimpleAttributeSet * getAttributes();
+  virtual jint getCurrentLine();
+  virtual jint getCurrentPos();
+  virtual void endTag(jboolean);
+  virtual void error(::java::lang::String *);
+  virtual void error(::java::lang::String *, ::java::lang::String *);
+  virtual void error(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
+  virtual void error(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
+  virtual void flushAttributes();
+  virtual void handleComment(JArray< jchar > *);
+  virtual void handleEOFInComment();
+  virtual void handleEmptyTag(::javax::swing::text::html::parser::TagElement *);
+  virtual void handleEndTag(::javax::swing::text::html::parser::TagElement *);
+  virtual void handleError(jint, ::java::lang::String *);
+  virtual void handleStartTag(::javax::swing::text::html::parser::TagElement *);
+  virtual void handleText(JArray< jchar > *);
+  virtual void handleTitle(JArray< jchar > *);
+  virtual ::javax::swing::text::html::parser::TagElement * makeTag(::javax::swing::text::html::parser::Element *);
+  virtual ::javax::swing::text::html::parser::TagElement * makeTag(::javax::swing::text::html::parser::Element *, jboolean);
+  virtual void markFirstTime(::javax::swing::text::html::parser::Element *);
+  virtual void startTag(::javax::swing::text::html::parser::TagElement *);
+  ::javax::swing::text::html::parser::DTD * __attribute__((aligned(__alignof__( ::java::lang::Object)))) dtd;
+  jboolean strict;
+public: // actually package-private
+  ::gnu::javax::swing::text::html::parser::support::Parser * gnu;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_parser_Parser__
diff --git a/libjava/javax/swing/text/html/parser/ParserDelegator$gnuParser.h b/libjava/javax/swing/text/html/parser/ParserDelegator$gnuParser.h
new file mode 100644
index 000000000..fec9d39c1
--- /dev/null
+++ b/libjava/javax/swing/text/html/parser/ParserDelegator$gnuParser.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_parser_ParserDelegator$gnuParser__
+#define __javax_swing_text_html_parser_ParserDelegator$gnuParser__
+
+#pragma interface
+
+#include <gnu/javax/swing/text/html/parser/support/Parser.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace html
+        {
+          namespace parser
+          {
+              class DTD;
+              class ParserDelegator;
+              class ParserDelegator$gnuParser;
+              class TagElement;
+          }
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::parser::ParserDelegator$gnuParser : public ::gnu::javax::swing::text::html::parser::support::Parser
+{
+
+  ParserDelegator$gnuParser(::javax::swing::text::html::parser::ParserDelegator *, ::javax::swing::text::html::parser::DTD *);
+public: // actually protected
+  virtual void handleComment(JArray< jchar > *);
+  virtual void handleEmptyTag(::javax::swing::text::html::parser::TagElement *);
+  virtual void handleEndTag(::javax::swing::text::html::parser::TagElement *);
+  virtual void handleError(jint, ::java::lang::String *);
+  virtual void handleStartTag(::javax::swing::text::html::parser::TagElement *);
+  virtual void handleText(JArray< jchar > *);
+public: // actually package-private
+  virtual ::javax::swing::text::html::parser::DTD * getDTD();
+  ParserDelegator$gnuParser(::javax::swing::text::html::parser::ParserDelegator *, ::javax::swing::text::html::parser::DTD *, ::javax::swing::text::html::parser::ParserDelegator$gnuParser *);
+private:
+  static const jlong serialVersionUID = 1LL;
+public: // actually package-private
+  ::javax::swing::text::html::parser::ParserDelegator * __attribute__((aligned(__alignof__( ::gnu::javax::swing::text::html::parser::support::Parser)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_parser_ParserDelegator$gnuParser__
diff --git a/libjava/javax/swing/text/html/parser/ParserDelegator.h b/libjava/javax/swing/text/html/parser/ParserDelegator.h
new file mode 100644
index 000000000..b2c35297b
--- /dev/null
+++ b/libjava/javax/swing/text/html/parser/ParserDelegator.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_parser_ParserDelegator__
+#define __javax_swing_text_html_parser_ParserDelegator__
+
+#pragma interface
+
+#include <javax/swing/text/html/HTMLEditorKit$Parser.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace html
+        {
+            class HTMLEditorKit$ParserCallback;
+          namespace parser
+          {
+              class DTD;
+              class ParserDelegator;
+              class ParserDelegator$gnuParser;
+          }
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::parser::ParserDelegator : public ::javax::swing::text::html::HTMLEditorKit$Parser
+{
+
+public:
+  ParserDelegator();
+  virtual void parse(::java::io::Reader *, ::javax::swing::text::html::HTMLEditorKit$ParserCallback *, jboolean);
+public: // actually protected
+  static void setDefaultDTD();
+  static ::javax::swing::text::html::parser::DTD * createDTD(::javax::swing::text::html::parser::DTD *, ::java::lang::String *);
+private:
+  static const jlong serialVersionUID = -1276686502624777206LL;
+  static ::javax::swing::text::html::parser::DTD * dtd;
+public: // actually package-private
+  ::javax::swing::text::html::HTMLEditorKit$ParserCallback * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLEditorKit$Parser)))) callBack;
+  ::javax::swing::text::html::parser::ParserDelegator$gnuParser * gnu;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_parser_ParserDelegator__
diff --git a/libjava/javax/swing/text/html/parser/TagElement.h b/libjava/javax/swing/text/html/parser/TagElement.h
new file mode 100644
index 000000000..b29cad472
--- /dev/null
+++ b/libjava/javax/swing/text/html/parser/TagElement.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_html_parser_TagElement__
+#define __javax_swing_text_html_parser_TagElement__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace html
+        {
+            class HTML$Tag;
+          namespace parser
+          {
+              class Element;
+              class TagElement;
+          }
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::html::parser::TagElement : public ::java::lang::Object
+{
+
+public:
+  TagElement(::javax::swing::text::html::parser::Element *);
+  TagElement(::javax::swing::text::html::parser::Element *, jboolean);
+  virtual ::javax::swing::text::html::parser::Element * getElement();
+  virtual ::javax::swing::text::html::HTML$Tag * getHTMLTag();
+  virtual jboolean isPreformatted();
+  virtual jboolean breaksFlow();
+  virtual jboolean fictional();
+  virtual ::java::lang::String * toString();
+private:
+  ::javax::swing::text::html::parser::Element * __attribute__((aligned(__alignof__( ::java::lang::Object)))) element;
+  ::javax::swing::text::html::HTML$Tag * tag;
+  jboolean fictional__;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_html_parser_TagElement__
diff --git a/libjava/javax/swing/text/rtf/ControlWordToken.h b/libjava/javax/swing/text/rtf/ControlWordToken.h
new file mode 100644
index 000000000..aa6a352a4
--- /dev/null
+++ b/libjava/javax/swing/text/rtf/ControlWordToken.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_rtf_ControlWordToken__
+#define __javax_swing_text_rtf_ControlWordToken__
+
+#pragma interface
+
+#include <javax/swing/text/rtf/Token.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace rtf
+        {
+            class ControlWordToken;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::rtf::ControlWordToken : public ::javax::swing::text::rtf::Token
+{
+
+public:
+  ControlWordToken(::java::lang::String *);
+  ControlWordToken(::java::lang::String *, jint);
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::text::rtf::Token)))) name;
+  jint param;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_rtf_ControlWordToken__
diff --git a/libjava/javax/swing/text/rtf/RTFEditorKit.h b/libjava/javax/swing/text/rtf/RTFEditorKit.h
new file mode 100644
index 000000000..789bec142
--- /dev/null
+++ b/libjava/javax/swing/text/rtf/RTFEditorKit.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_rtf_RTFEditorKit__
+#define __javax_swing_text_rtf_RTFEditorKit__
+
+#pragma interface
+
+#include <javax/swing/text/StyledEditorKit.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Document;
+        namespace rtf
+        {
+            class RTFEditorKit;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::rtf::RTFEditorKit : public ::javax::swing::text::StyledEditorKit
+{
+
+public:
+  RTFEditorKit();
+  virtual ::java::lang::String * getContentType();
+  virtual void read(::java::io::InputStream *, ::javax::swing::text::Document *, jint);
+  virtual void read(::java::io::Reader *, ::javax::swing::text::Document *, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_rtf_RTFEditorKit__
diff --git a/libjava/javax/swing/text/rtf/RTFParseException.h b/libjava/javax/swing/text/rtf/RTFParseException.h
new file mode 100644
index 000000000..4c5e2b81a
--- /dev/null
+++ b/libjava/javax/swing/text/rtf/RTFParseException.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_rtf_RTFParseException__
+#define __javax_swing_text_rtf_RTFParseException__
+
+#pragma interface
+
+#include <java/lang/RuntimeException.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace rtf
+        {
+            class RTFParseException;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::rtf::RTFParseException : public ::java::lang::RuntimeException
+{
+
+public:
+  RTFParseException();
+  RTFParseException(::java::lang::String *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_rtf_RTFParseException__
diff --git a/libjava/javax/swing/text/rtf/RTFParser.h b/libjava/javax/swing/text/rtf/RTFParser.h
new file mode 100644
index 000000000..5de9f5920
--- /dev/null
+++ b/libjava/javax/swing/text/rtf/RTFParser.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_rtf_RTFParser__
+#define __javax_swing_text_rtf_RTFParser__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+          class Document;
+        namespace rtf
+        {
+            class RTFParser;
+            class RTFScanner;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::rtf::RTFParser : public ::java::lang::Object
+{
+
+  RTFParser(::javax::swing::text::Document *, jint);
+public:
+  RTFParser(::java::io::InputStream *, ::javax::swing::text::Document *, jint);
+  RTFParser(::java::io::Reader *, ::javax::swing::text::Document *, jint);
+  virtual ::javax::swing::text::Document * getDocument();
+  virtual void parse();
+private:
+  void parseFile();
+  void parseHeader();
+  void parseDocument();
+  ::javax::swing::text::rtf::RTFScanner * __attribute__((aligned(__alignof__( ::java::lang::Object)))) scanner;
+  ::javax::swing::text::Document * doc;
+  jint pos;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_rtf_RTFParser__
diff --git a/libjava/javax/swing/text/rtf/RTFScanner.h b/libjava/javax/swing/text/rtf/RTFScanner.h
new file mode 100644
index 000000000..ebfd9108a
--- /dev/null
+++ b/libjava/javax/swing/text/rtf/RTFScanner.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_rtf_RTFScanner__
+#define __javax_swing_text_rtf_RTFScanner__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace rtf
+        {
+            class RTFScanner;
+            class Token;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::rtf::RTFScanner : public ::java::lang::Object
+{
+
+  RTFScanner();
+public:
+  RTFScanner(::java::io::InputStream *);
+  RTFScanner(::java::io::Reader *);
+private:
+  ::javax::swing::text::rtf::Token * readTokenImpl();
+public: // actually package-private
+  virtual ::javax::swing::text::rtf::Token * peekToken();
+  virtual ::javax::swing::text::rtf::Token * readToken();
+private:
+  ::javax::swing::text::rtf::Token * readControlWord();
+  ::javax::swing::text::rtf::Token * readText();
+  ::java::io::Reader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) in;
+  ::java::lang::StringBuffer * buffer;
+  ::javax::swing::text::rtf::Token * lastToken;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_rtf_RTFScanner__
diff --git a/libjava/javax/swing/text/rtf/TextToken.h b/libjava/javax/swing/text/rtf/TextToken.h
new file mode 100644
index 000000000..189d22994
--- /dev/null
+++ b/libjava/javax/swing/text/rtf/TextToken.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_rtf_TextToken__
+#define __javax_swing_text_rtf_TextToken__
+
+#pragma interface
+
+#include <javax/swing/text/rtf/Token.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace rtf
+        {
+            class TextToken;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::rtf::TextToken : public ::javax::swing::text::rtf::Token
+{
+
+public:
+  TextToken(::java::lang::String *);
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::text::rtf::Token)))) text;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_rtf_TextToken__
diff --git a/libjava/javax/swing/text/rtf/Token.h b/libjava/javax/swing/text/rtf/Token.h
new file mode 100644
index 000000000..bd32666bf
--- /dev/null
+++ b/libjava/javax/swing/text/rtf/Token.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_text_rtf_Token__
+#define __javax_swing_text_rtf_Token__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace text
+      {
+        namespace rtf
+        {
+            class Token;
+        }
+      }
+    }
+  }
+}
+
+class javax::swing::text::rtf::Token : public ::java::lang::Object
+{
+
+public:
+  Token(jint);
+  static const jint EOF = -1;
+  static const jint LCURLY = 1;
+  static const jint RCURLY = 2;
+  static const jint CONTROL_WORD = 3;
+  static const jint TEXT = 4;
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_text_rtf_Token__
diff --git a/libjava/javax/swing/tree/AbstractLayoutCache$NodeDimensions.h b/libjava/javax/swing/tree/AbstractLayoutCache$NodeDimensions.h
new file mode 100644
index 000000000..88eca9e7b
--- /dev/null
+++ b/libjava/javax/swing/tree/AbstractLayoutCache$NodeDimensions.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_tree_AbstractLayoutCache$NodeDimensions__
+#define __javax_swing_tree_AbstractLayoutCache$NodeDimensions__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace tree
+      {
+          class AbstractLayoutCache$NodeDimensions;
+      }
+    }
+  }
+}
+
+class javax::swing::tree::AbstractLayoutCache$NodeDimensions : public ::java::lang::Object
+{
+
+public:
+  AbstractLayoutCache$NodeDimensions();
+  virtual ::java::awt::Rectangle * getNodeDimensions(::java::lang::Object *, jint, jint, jboolean, ::java::awt::Rectangle *) = 0;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_tree_AbstractLayoutCache$NodeDimensions__
diff --git a/libjava/javax/swing/tree/AbstractLayoutCache.h b/libjava/javax/swing/tree/AbstractLayoutCache.h
new file mode 100644
index 000000000..d51c8e852
--- /dev/null
+++ b/libjava/javax/swing/tree/AbstractLayoutCache.h
@@ -0,0 +1,89 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_tree_AbstractLayoutCache__
+#define __javax_swing_tree_AbstractLayoutCache__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class TreeModelEvent;
+      }
+      namespace tree
+      {
+          class AbstractLayoutCache;
+          class AbstractLayoutCache$NodeDimensions;
+          class TreeModel;
+          class TreePath;
+          class TreeSelectionModel;
+      }
+    }
+  }
+}
+
+class javax::swing::tree::AbstractLayoutCache : public ::java::lang::Object
+{
+
+public:
+  AbstractLayoutCache();
+  virtual void setNodeDimensions(::javax::swing::tree::AbstractLayoutCache$NodeDimensions *);
+  virtual ::javax::swing::tree::AbstractLayoutCache$NodeDimensions * getNodeDimensions();
+public: // actually protected
+  virtual ::java::awt::Rectangle * getNodeDimensions(::java::lang::Object *, jint, jint, jboolean, ::java::awt::Rectangle *);
+public:
+  virtual void setModel(::javax::swing::tree::TreeModel *);
+  virtual ::javax::swing::tree::TreeModel * getModel();
+  virtual void setRootVisible(jboolean);
+  virtual jboolean isRootVisible();
+  virtual void setRowHeight(jint);
+  virtual jint getRowHeight();
+  virtual void setSelectionModel(::javax::swing::tree::TreeSelectionModel *);
+  virtual ::javax::swing::tree::TreeSelectionModel * getSelectionModel();
+  virtual jint getPreferredHeight();
+  virtual jint getPreferredWidth(::java::awt::Rectangle *);
+  virtual jboolean isExpanded(::javax::swing::tree::TreePath *) = 0;
+  virtual ::java::awt::Rectangle * getBounds(::javax::swing::tree::TreePath *, ::java::awt::Rectangle *) = 0;
+  virtual ::javax::swing::tree::TreePath * getPathForRow(jint) = 0;
+  virtual jint getRowForPath(::javax::swing::tree::TreePath *) = 0;
+  virtual ::javax::swing::tree::TreePath * getPathClosestTo(jint, jint) = 0;
+  virtual ::java::util::Enumeration * getVisiblePathsFrom(::javax::swing::tree::TreePath *) = 0;
+  virtual jint getVisibleChildCount(::javax::swing::tree::TreePath *) = 0;
+  virtual void setExpandedState(::javax::swing::tree::TreePath *, jboolean) = 0;
+  virtual jboolean getExpandedState(::javax::swing::tree::TreePath *) = 0;
+  virtual jint getRowCount() = 0;
+  virtual void invalidateSizes() = 0;
+  virtual void invalidatePathBounds(::javax::swing::tree::TreePath *) = 0;
+  virtual void treeNodesChanged(::javax::swing::event::TreeModelEvent *) = 0;
+  virtual void treeNodesInserted(::javax::swing::event::TreeModelEvent *) = 0;
+  virtual void treeNodesRemoved(::javax::swing::event::TreeModelEvent *) = 0;
+  virtual void treeStructureChanged(::javax::swing::event::TreeModelEvent *) = 0;
+  virtual JArray< jint > * getRowsForPaths(JArray< ::javax::swing::tree::TreePath * > *);
+public: // actually protected
+  virtual jboolean isFixedRowHeight();
+  ::javax::swing::tree::AbstractLayoutCache$NodeDimensions * __attribute__((aligned(__alignof__( ::java::lang::Object)))) nodeDimensions;
+  ::javax::swing::tree::TreeModel * treeModel;
+  ::javax::swing::tree::TreeSelectionModel * treeSelectionModel;
+  jboolean rootVisible;
+  jint rowHeight;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_tree_AbstractLayoutCache__
diff --git a/libjava/javax/swing/tree/DefaultMutableTreeNode$BreadthFirstEnumeration.h b/libjava/javax/swing/tree/DefaultMutableTreeNode$BreadthFirstEnumeration.h
new file mode 100644
index 000000000..9c13e7591
--- /dev/null
+++ b/libjava/javax/swing/tree/DefaultMutableTreeNode$BreadthFirstEnumeration.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_tree_DefaultMutableTreeNode$BreadthFirstEnumeration__
+#define __javax_swing_tree_DefaultMutableTreeNode$BreadthFirstEnumeration__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace tree
+      {
+          class DefaultMutableTreeNode$BreadthFirstEnumeration;
+          class TreeNode;
+      }
+    }
+  }
+}
+
+class javax::swing::tree::DefaultMutableTreeNode$BreadthFirstEnumeration : public ::java::lang::Object
+{
+
+public: // actually package-private
+  DefaultMutableTreeNode$BreadthFirstEnumeration(::javax::swing::tree::TreeNode *);
+public:
+  virtual jboolean hasMoreElements();
+  virtual ::javax::swing::tree::TreeNode * DefaultMutableTreeNode$BreadthFirstEnumeration$nextElement();
+  virtual ::java::lang::Object * nextElement();
+public: // actually package-private
+  ::java::util::LinkedList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) queue;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_tree_DefaultMutableTreeNode$BreadthFirstEnumeration__
diff --git a/libjava/javax/swing/tree/DefaultMutableTreeNode$PostorderEnumeration.h b/libjava/javax/swing/tree/DefaultMutableTreeNode$PostorderEnumeration.h
new file mode 100644
index 000000000..31065d669
--- /dev/null
+++ b/libjava/javax/swing/tree/DefaultMutableTreeNode$PostorderEnumeration.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_tree_DefaultMutableTreeNode$PostorderEnumeration__
+#define __javax_swing_tree_DefaultMutableTreeNode$PostorderEnumeration__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace tree
+      {
+          class DefaultMutableTreeNode$PostorderEnumeration;
+          class TreeNode;
+      }
+    }
+  }
+}
+
+class javax::swing::tree::DefaultMutableTreeNode$PostorderEnumeration : public ::java::lang::Object
+{
+
+public: // actually package-private
+  DefaultMutableTreeNode$PostorderEnumeration(::javax::swing::tree::TreeNode *);
+public:
+  virtual jboolean hasMoreElements();
+  virtual ::javax::swing::tree::TreeNode * DefaultMutableTreeNode$PostorderEnumeration$nextElement();
+private:
+  ::javax::swing::tree::TreeNode * traverse(::java::util::Enumeration *);
+public:
+  virtual ::java::lang::Object * nextElement();
+public: // actually package-private
+  ::java::util::Stack * __attribute__((aligned(__alignof__( ::java::lang::Object)))) nodes;
+  ::java::util::Stack * childrenEnums;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_tree_DefaultMutableTreeNode$PostorderEnumeration__
diff --git a/libjava/javax/swing/tree/DefaultMutableTreeNode$PreorderEnumeration.h b/libjava/javax/swing/tree/DefaultMutableTreeNode$PreorderEnumeration.h
new file mode 100644
index 000000000..98117b06f
--- /dev/null
+++ b/libjava/javax/swing/tree/DefaultMutableTreeNode$PreorderEnumeration.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_tree_DefaultMutableTreeNode$PreorderEnumeration__
+#define __javax_swing_tree_DefaultMutableTreeNode$PreorderEnumeration__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace tree
+      {
+          class DefaultMutableTreeNode$PreorderEnumeration;
+          class TreeNode;
+      }
+    }
+  }
+}
+
+class javax::swing::tree::DefaultMutableTreeNode$PreorderEnumeration : public ::java::lang::Object
+{
+
+public: // actually package-private
+  DefaultMutableTreeNode$PreorderEnumeration(::javax::swing::tree::TreeNode *);
+public:
+  virtual jboolean hasMoreElements();
+  virtual ::javax::swing::tree::TreeNode * DefaultMutableTreeNode$PreorderEnumeration$nextElement();
+private:
+  ::javax::swing::tree::TreeNode * traverse(::java::util::Enumeration *);
+public:
+  virtual ::java::lang::Object * nextElement();
+public: // actually package-private
+  ::javax::swing::tree::TreeNode * __attribute__((aligned(__alignof__( ::java::lang::Object)))) next;
+  ::java::util::Stack * childrenEnums;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_tree_DefaultMutableTreeNode$PreorderEnumeration__
diff --git a/libjava/javax/swing/tree/DefaultMutableTreeNode.h b/libjava/javax/swing/tree/DefaultMutableTreeNode.h
new file mode 100644
index 000000000..b5a465323
--- /dev/null
+++ b/libjava/javax/swing/tree/DefaultMutableTreeNode.h
@@ -0,0 +1,105 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_tree_DefaultMutableTreeNode__
+#define __javax_swing_tree_DefaultMutableTreeNode__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace tree
+      {
+          class DefaultMutableTreeNode;
+          class MutableTreeNode;
+          class TreeNode;
+      }
+    }
+  }
+}
+
+class javax::swing::tree::DefaultMutableTreeNode : public ::java::lang::Object
+{
+
+public:
+  DefaultMutableTreeNode();
+  DefaultMutableTreeNode(::java::lang::Object *);
+  DefaultMutableTreeNode(::java::lang::Object *, jboolean);
+  virtual ::java::lang::Object * clone();
+  virtual ::java::lang::String * toString();
+  virtual void add(::javax::swing::tree::MutableTreeNode *);
+  virtual ::javax::swing::tree::TreeNode * getParent();
+  virtual void remove(jint);
+  virtual void remove(::javax::swing::tree::MutableTreeNode *);
+private:
+  void writeObject(::java::io::ObjectOutputStream *);
+  void readObject(::java::io::ObjectInputStream *);
+public:
+  virtual void insert(::javax::swing::tree::MutableTreeNode *, jint);
+  virtual JArray< ::javax::swing::tree::TreeNode * > * getPath();
+  virtual ::java::util::Enumeration * children();
+  virtual void setParent(::javax::swing::tree::MutableTreeNode *);
+  virtual ::javax::swing::tree::TreeNode * getChildAt(jint);
+  virtual jint getChildCount();
+  virtual jint getIndex(::javax::swing::tree::TreeNode *);
+  virtual void setAllowsChildren(jboolean);
+  virtual jboolean getAllowsChildren();
+  virtual void setUserObject(::java::lang::Object *);
+  virtual ::java::lang::Object * getUserObject();
+  virtual void removeFromParent();
+  virtual void removeAllChildren();
+  virtual jboolean isNodeAncestor(::javax::swing::tree::TreeNode *);
+  virtual jboolean isNodeDescendant(::javax::swing::tree::DefaultMutableTreeNode *);
+  virtual ::javax::swing::tree::TreeNode * getSharedAncestor(::javax::swing::tree::DefaultMutableTreeNode *);
+  virtual jboolean isNodeRelated(::javax::swing::tree::DefaultMutableTreeNode *);
+  virtual jint getDepth();
+  virtual jint getLevel();
+public: // actually protected
+  virtual JArray< ::javax::swing::tree::TreeNode * > * getPathToRoot(::javax::swing::tree::TreeNode *, jint);
+public:
+  virtual JArray< ::java::lang::Object * > * getUserObjectPath();
+  virtual ::javax::swing::tree::TreeNode * getRoot();
+  virtual jboolean isRoot();
+  virtual ::javax::swing::tree::DefaultMutableTreeNode * getNextNode();
+  virtual ::javax::swing::tree::DefaultMutableTreeNode * getPreviousNode();
+  virtual ::java::util::Enumeration * preorderEnumeration();
+  virtual ::java::util::Enumeration * postorderEnumeration();
+  virtual ::java::util::Enumeration * breadthFirstEnumeration();
+  virtual ::java::util::Enumeration * depthFirstEnumeration();
+  virtual ::java::util::Enumeration * pathFromAncestorEnumeration(::javax::swing::tree::TreeNode *);
+  virtual jboolean isNodeChild(::javax::swing::tree::TreeNode *);
+  virtual ::javax::swing::tree::TreeNode * getFirstChild();
+  virtual ::javax::swing::tree::TreeNode * getLastChild();
+  virtual ::javax::swing::tree::TreeNode * getChildAfter(::javax::swing::tree::TreeNode *);
+  virtual ::javax::swing::tree::TreeNode * getChildBefore(::javax::swing::tree::TreeNode *);
+  virtual jboolean isNodeSibling(::javax::swing::tree::TreeNode *);
+  virtual jint getSiblingCount();
+  virtual ::javax::swing::tree::DefaultMutableTreeNode * getNextSibling();
+  virtual ::javax::swing::tree::DefaultMutableTreeNode * getPreviousSibling();
+  virtual jboolean isLeaf();
+  virtual ::javax::swing::tree::DefaultMutableTreeNode * getFirstLeaf();
+  virtual ::javax::swing::tree::DefaultMutableTreeNode * getLastLeaf();
+  virtual ::javax::swing::tree::DefaultMutableTreeNode * getNextLeaf();
+  virtual ::javax::swing::tree::DefaultMutableTreeNode * getPreviousLeaf();
+  virtual jint getLeafCount();
+private:
+  static const jlong serialVersionUID = -4298474751201349152LL;
+public:
+  static ::java::util::Enumeration * EMPTY_ENUMERATION;
+public: // actually protected
+  ::javax::swing::tree::MutableTreeNode * __attribute__((aligned(__alignof__( ::java::lang::Object)))) parent;
+  ::java::util::Vector * children__;
+  ::java::lang::Object * userObject;
+  jboolean allowsChildren;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_tree_DefaultMutableTreeNode__
diff --git a/libjava/javax/swing/tree/DefaultTreeCellEditor$DefaultTextField.h b/libjava/javax/swing/tree/DefaultTreeCellEditor$DefaultTextField.h
new file mode 100644
index 000000000..a09a8dcbe
--- /dev/null
+++ b/libjava/javax/swing/tree/DefaultTreeCellEditor$DefaultTextField.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_tree_DefaultTreeCellEditor$DefaultTextField__
+#define __javax_swing_tree_DefaultTreeCellEditor$DefaultTextField__
+
+#pragma interface
+
+#include <javax/swing/JTextField.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Font;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace border
+      {
+          class Border;
+      }
+      namespace tree
+      {
+          class DefaultTreeCellEditor;
+          class DefaultTreeCellEditor$DefaultTextField;
+      }
+    }
+  }
+}
+
+class javax::swing::tree::DefaultTreeCellEditor$DefaultTextField : public ::javax::swing::JTextField
+{
+
+public:
+  DefaultTreeCellEditor$DefaultTextField(::javax::swing::tree::DefaultTreeCellEditor *, ::javax::swing::border::Border *);
+  virtual ::java::awt::Font * getFont();
+  virtual ::javax::swing::border::Border * getBorder();
+  virtual ::java::awt::Dimension * getPreferredSize();
+public: // actually package-private
+  static const jlong serialVersionUID = -6629304544265300143LL;
+public: // actually protected
+  ::javax::swing::border::Border * __attribute__((aligned(__alignof__( ::javax::swing::JTextField)))) border;
+public: // actually package-private
+  ::javax::swing::tree::DefaultTreeCellEditor * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_tree_DefaultTreeCellEditor$DefaultTextField__
diff --git a/libjava/javax/swing/tree/DefaultTreeCellEditor$EditorContainer.h b/libjava/javax/swing/tree/DefaultTreeCellEditor$EditorContainer.h
new file mode 100644
index 000000000..554543398
--- /dev/null
+++ b/libjava/javax/swing/tree/DefaultTreeCellEditor$EditorContainer.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_tree_DefaultTreeCellEditor$EditorContainer__
+#define __javax_swing_tree_DefaultTreeCellEditor$EditorContainer__
+
+#pragma interface
+
+#include <java/awt/Container.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dimension;
+        class Graphics;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace tree
+      {
+          class DefaultTreeCellEditor;
+          class DefaultTreeCellEditor$EditorContainer;
+      }
+    }
+  }
+}
+
+class javax::swing::tree::DefaultTreeCellEditor$EditorContainer : public ::java::awt::Container
+{
+
+public:
+  DefaultTreeCellEditor$EditorContainer(::javax::swing::tree::DefaultTreeCellEditor *);
+  virtual void EditorContainer();
+  virtual void paint(::java::awt::Graphics *);
+  virtual void doLayout();
+  virtual ::java::awt::Dimension * getPreferredSize();
+public: // actually package-private
+  static const jlong serialVersionUID = 6470339600449699810LL;
+  ::javax::swing::tree::DefaultTreeCellEditor * __attribute__((aligned(__alignof__( ::java::awt::Container)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_tree_DefaultTreeCellEditor$EditorContainer__
diff --git a/libjava/javax/swing/tree/DefaultTreeCellEditor.h b/libjava/javax/swing/tree/DefaultTreeCellEditor.h
new file mode 100644
index 000000000..bac3f21ad
--- /dev/null
+++ b/libjava/javax/swing/tree/DefaultTreeCellEditor.h
@@ -0,0 +1,110 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_tree_DefaultTreeCellEditor__
+#define __javax_swing_tree_DefaultTreeCellEditor__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Container;
+        class Font;
+      namespace event
+      {
+          class ActionEvent;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+        class JTree;
+        class Timer;
+      namespace event
+      {
+          class CellEditorListener;
+          class EventListenerList;
+          class TreeSelectionEvent;
+      }
+      namespace tree
+      {
+          class DefaultTreeCellEditor;
+          class DefaultTreeCellRenderer;
+          class TreeCellEditor;
+          class TreePath;
+      }
+    }
+  }
+}
+
+class javax::swing::tree::DefaultTreeCellEditor : public ::java::lang::Object
+{
+
+public:
+  DefaultTreeCellEditor(::javax::swing::JTree *, ::javax::swing::tree::DefaultTreeCellRenderer *);
+  DefaultTreeCellEditor(::javax::swing::JTree *, ::javax::swing::tree::DefaultTreeCellRenderer *, ::javax::swing::tree::TreeCellEditor *);
+private:
+  void writeObject(::java::io::ObjectOutputStream *);
+  void readObject(::java::io::ObjectInputStream *);
+public:
+  virtual void setBorderSelectionColor(::java::awt::Color *);
+  virtual ::java::awt::Color * getBorderSelectionColor();
+  virtual void setFont(::java::awt::Font *);
+  virtual ::java::awt::Font * getFont();
+  virtual ::java::awt::Component * getTreeCellEditorComponent(::javax::swing::JTree *, ::java::lang::Object *, jboolean, jboolean, jboolean, jint);
+  virtual ::java::lang::Object * getCellEditorValue();
+  virtual jboolean isCellEditable(::java::util::EventObject *);
+  virtual jboolean shouldSelectCell(::java::util::EventObject *);
+  virtual jboolean stopCellEditing();
+  virtual void cancelCellEditing();
+private:
+  void finish();
+public:
+  virtual void addCellEditorListener(::javax::swing::event::CellEditorListener *);
+  virtual void removeCellEditorListener(::javax::swing::event::CellEditorListener *);
+  virtual JArray< ::javax::swing::event::CellEditorListener * > * getCellEditorListeners();
+  virtual void valueChanged(::javax::swing::event::TreeSelectionEvent *);
+  virtual void actionPerformed(::java::awt::event::ActionEvent *);
+public: // actually protected
+  virtual void setTree(::javax::swing::JTree *);
+  virtual jboolean shouldStartEditingTimer(::java::util::EventObject *);
+  virtual void startEditingTimer();
+  virtual jboolean canEditImmediately(::java::util::EventObject *);
+  virtual jboolean inHitRegion(jint, jint);
+  virtual void determineOffset(::javax::swing::JTree *, ::java::lang::Object *, jboolean, jboolean, jboolean, jint);
+  virtual void prepareForEditing();
+  virtual ::java::awt::Container * createContainer();
+  virtual ::javax::swing::tree::TreeCellEditor * createTreeCellEditor();
+private:
+  ::javax::swing::event::EventListenerList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) listenerList;
+public: // actually protected
+  ::javax::swing::tree::TreeCellEditor * realEditor;
+  ::javax::swing::tree::DefaultTreeCellRenderer * renderer;
+  ::java::awt::Container * editingContainer;
+  ::java::awt::Component * editingComponent;
+  jboolean canEdit;
+  jint offset;
+  ::javax::swing::JTree * tree;
+  ::javax::swing::tree::TreePath * lastPath;
+  ::javax::swing::Timer * timer;
+  jint lastRow;
+  ::java::awt::Color * borderSelectionColor;
+  ::javax::swing::Icon * editingIcon;
+  ::java::awt::Font * font;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_tree_DefaultTreeCellEditor__
diff --git a/libjava/javax/swing/tree/DefaultTreeCellRenderer.h b/libjava/javax/swing/tree/DefaultTreeCellRenderer.h
new file mode 100644
index 000000000..5677bad36
--- /dev/null
+++ b/libjava/javax/swing/tree/DefaultTreeCellRenderer.h
@@ -0,0 +1,105 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_tree_DefaultTreeCellRenderer__
+#define __javax_swing_tree_DefaultTreeCellRenderer__
+
+#pragma interface
+
+#include <javax/swing/JLabel.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Color;
+        class Component;
+        class Dimension;
+        class Font;
+        class Graphics;
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class Icon;
+        class JTree;
+      namespace tree
+      {
+          class DefaultTreeCellRenderer;
+      }
+    }
+  }
+}
+
+class javax::swing::tree::DefaultTreeCellRenderer : public ::javax::swing::JLabel
+{
+
+public:
+  DefaultTreeCellRenderer();
+  virtual ::javax::swing::Icon * getDefaultOpenIcon();
+  virtual ::javax::swing::Icon * getDefaultClosedIcon();
+  virtual ::javax::swing::Icon * getDefaultLeafIcon();
+  virtual void setOpenIcon(::javax::swing::Icon *);
+  virtual ::javax::swing::Icon * getOpenIcon();
+  virtual void setClosedIcon(::javax::swing::Icon *);
+  virtual ::javax::swing::Icon * getClosedIcon();
+  virtual void setLeafIcon(::javax::swing::Icon *);
+  virtual ::javax::swing::Icon * getLeafIcon();
+  virtual void setTextSelectionColor(::java::awt::Color *);
+  virtual ::java::awt::Color * getTextSelectionColor();
+  virtual void setTextNonSelectionColor(::java::awt::Color *);
+  virtual ::java::awt::Color * getTextNonSelectionColor();
+  virtual void setBackgroundSelectionColor(::java::awt::Color *);
+  virtual ::java::awt::Color * getBackgroundSelectionColor();
+  virtual void setBackgroundNonSelectionColor(::java::awt::Color *);
+  virtual ::java::awt::Color * getBackgroundNonSelectionColor();
+  virtual void setBorderSelectionColor(::java::awt::Color *);
+  virtual ::java::awt::Color * getBorderSelectionColor();
+  virtual void setFont(::java::awt::Font *);
+  virtual void setBackground(::java::awt::Color *);
+  virtual ::java::awt::Component * getTreeCellRendererComponent(::javax::swing::JTree *, ::java::lang::Object *, jboolean, jboolean, jboolean, jint, jboolean);
+  virtual ::java::awt::Font * getFont();
+  virtual void paint(::java::awt::Graphics *);
+private:
+  void paintFocus(::java::awt::Graphics *, jint, jint, jint, jint);
+  jint getXOffset();
+public:
+  virtual ::java::awt::Dimension * getPreferredSize();
+  virtual void validate();
+  virtual void revalidate();
+  virtual void repaint(jlong, jint, jint, jint, jint);
+  virtual void repaint(::java::awt::Rectangle *);
+public: // actually protected
+  virtual void firePropertyChange(::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *);
+public:
+  virtual void firePropertyChange(::java::lang::String *, jbyte, jbyte);
+  virtual void firePropertyChange(::java::lang::String *, jchar, jchar);
+  virtual void firePropertyChange(::java::lang::String *, jshort, jshort);
+  virtual void firePropertyChange(::java::lang::String *, jint, jint);
+  virtual void firePropertyChange(::java::lang::String *, jlong, jlong);
+  virtual void firePropertyChange(::java::lang::String *, jfloat, jfloat);
+  virtual void firePropertyChange(::java::lang::String *, jdouble, jdouble);
+  virtual void firePropertyChange(::java::lang::String *, jboolean, jboolean);
+public: // actually protected
+  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JLabel)))) selected;
+  jboolean hasFocus;
+private:
+  jboolean drawsFocusBorderAroundIcon;
+public: // actually protected
+  ::javax::swing::Icon * closedIcon;
+  ::javax::swing::Icon * leafIcon;
+  ::javax::swing::Icon * openIcon;
+  ::java::awt::Color * textSelectionColor;
+  ::java::awt::Color * textNonSelectionColor;
+  ::java::awt::Color * backgroundSelectionColor;
+  ::java::awt::Color * backgroundNonSelectionColor;
+  ::java::awt::Color * borderSelectionColor;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_tree_DefaultTreeCellRenderer__
diff --git a/libjava/javax/swing/tree/DefaultTreeModel.h b/libjava/javax/swing/tree/DefaultTreeModel.h
new file mode 100644
index 000000000..18deb18fa
--- /dev/null
+++ b/libjava/javax/swing/tree/DefaultTreeModel.h
@@ -0,0 +1,86 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_tree_DefaultTreeModel__
+#define __javax_swing_tree_DefaultTreeModel__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class EventListenerList;
+          class TreeModelListener;
+      }
+      namespace tree
+      {
+          class DefaultTreeModel;
+          class MutableTreeNode;
+          class TreeNode;
+          class TreePath;
+      }
+    }
+  }
+}
+
+class javax::swing::tree::DefaultTreeModel : public ::java::lang::Object
+{
+
+public:
+  DefaultTreeModel(::javax::swing::tree::TreeNode *);
+  DefaultTreeModel(::javax::swing::tree::TreeNode *, jboolean);
+private:
+  void writeObject(::java::io::ObjectOutputStream *);
+  void readObject(::java::io::ObjectInputStream *);
+public:
+  virtual jboolean asksAllowsChildren();
+  virtual void setAsksAllowsChildren(jboolean);
+  virtual void setRoot(::javax::swing::tree::TreeNode *);
+  virtual ::java::lang::Object * getRoot();
+  virtual jint getIndexOfChild(::java::lang::Object *, ::java::lang::Object *);
+  virtual ::java::lang::Object * getChild(::java::lang::Object *, jint);
+  virtual jint getChildCount(::java::lang::Object *);
+  virtual jboolean isLeaf(::java::lang::Object *);
+  virtual void reload();
+  virtual void reload(::javax::swing::tree::TreeNode *);
+  virtual void valueForPathChanged(::javax::swing::tree::TreePath *, ::java::lang::Object *);
+  virtual void insertNodeInto(::javax::swing::tree::MutableTreeNode *, ::javax::swing::tree::MutableTreeNode *, jint);
+  virtual void removeNodeFromParent(::javax::swing::tree::MutableTreeNode *);
+  virtual void nodeChanged(::javax::swing::tree::TreeNode *);
+  virtual void nodesWereInserted(::javax::swing::tree::TreeNode *, JArray< jint > *);
+  virtual void nodesWereRemoved(::javax::swing::tree::TreeNode *, JArray< jint > *, JArray< ::java::lang::Object * > *);
+  virtual void nodesChanged(::javax::swing::tree::TreeNode *, JArray< jint > *);
+  virtual void nodeStructureChanged(::javax::swing::tree::TreeNode *);
+  virtual JArray< ::javax::swing::tree::TreeNode * > * getPathToRoot(::javax::swing::tree::TreeNode *);
+public: // actually protected
+  virtual JArray< ::javax::swing::tree::TreeNode * > * getPathToRoot(::javax::swing::tree::TreeNode *, jint);
+public:
+  virtual void addTreeModelListener(::javax::swing::event::TreeModelListener *);
+  virtual void removeTreeModelListener(::javax::swing::event::TreeModelListener *);
+  virtual JArray< ::javax::swing::event::TreeModelListener * > * getTreeModelListeners();
+public: // actually protected
+  virtual void fireTreeNodesChanged(::java::lang::Object *, JArray< ::java::lang::Object * > *, JArray< jint > *, JArray< ::java::lang::Object * > *);
+  virtual void fireTreeNodesInserted(::java::lang::Object *, JArray< ::java::lang::Object * > *, JArray< jint > *, JArray< ::java::lang::Object * > *);
+  virtual void fireTreeNodesRemoved(::java::lang::Object *, JArray< ::java::lang::Object * > *, JArray< jint > *, JArray< ::java::lang::Object * > *);
+  virtual void fireTreeStructureChanged(::java::lang::Object *, JArray< ::java::lang::Object * > *, JArray< jint > *, JArray< ::java::lang::Object * > *);
+public:
+  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
+public: // actually package-private
+  static const jlong serialVersionUID = -2621068368932566998LL;
+public: // actually protected
+  ::javax::swing::tree::TreeNode * __attribute__((aligned(__alignof__( ::java::lang::Object)))) root;
+  ::javax::swing::event::EventListenerList * listenerList;
+  jboolean asksAllowsChildren__;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_tree_DefaultTreeModel__
diff --git a/libjava/javax/swing/tree/DefaultTreeSelectionModel$PathPlaceHolder.h b/libjava/javax/swing/tree/DefaultTreeSelectionModel$PathPlaceHolder.h
new file mode 100644
index 000000000..c9544bb46
--- /dev/null
+++ b/libjava/javax/swing/tree/DefaultTreeSelectionModel$PathPlaceHolder.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_tree_DefaultTreeSelectionModel$PathPlaceHolder__
+#define __javax_swing_tree_DefaultTreeSelectionModel$PathPlaceHolder__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace tree
+      {
+          class DefaultTreeSelectionModel$PathPlaceHolder;
+          class TreePath;
+      }
+    }
+  }
+}
+
+class javax::swing::tree::DefaultTreeSelectionModel$PathPlaceHolder : public ::java::lang::Object
+{
+
+public: // actually package-private
+  DefaultTreeSelectionModel$PathPlaceHolder(::javax::swing::tree::TreePath *, jboolean);
+  ::javax::swing::tree::TreePath * __attribute__((aligned(__alignof__( ::java::lang::Object)))) path;
+  jboolean isNew;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_tree_DefaultTreeSelectionModel$PathPlaceHolder__
diff --git a/libjava/javax/swing/tree/DefaultTreeSelectionModel.h b/libjava/javax/swing/tree/DefaultTreeSelectionModel.h
new file mode 100644
index 000000000..07a358d15
--- /dev/null
+++ b/libjava/javax/swing/tree/DefaultTreeSelectionModel.h
@@ -0,0 +1,119 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_tree_DefaultTreeSelectionModel__
+#define __javax_swing_tree_DefaultTreeSelectionModel__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class DefaultListSelectionModel;
+      namespace event
+      {
+          class EventListenerList;
+          class SwingPropertyChangeSupport;
+          class TreeSelectionEvent;
+          class TreeSelectionListener;
+      }
+      namespace tree
+      {
+          class DefaultTreeSelectionModel;
+          class RowMapper;
+          class TreePath;
+      }
+    }
+  }
+}
+
+class javax::swing::tree::DefaultTreeSelectionModel : public ::java::lang::Object
+{
+
+public:
+  DefaultTreeSelectionModel();
+  virtual ::java::lang::Object * clone();
+  virtual ::java::lang::String * toString();
+private:
+  void writeObject(::java::io::ObjectOutputStream *);
+  void readObject(::java::io::ObjectInputStream *);
+public:
+  virtual void setRowMapper(::javax::swing::tree::RowMapper *);
+  virtual ::javax::swing::tree::RowMapper * getRowMapper();
+  virtual void setSelectionMode(jint);
+  virtual jint getSelectionMode();
+  virtual void setSelectionPath(::javax::swing::tree::TreePath *);
+public: // actually package-private
+  virtual jint getRow(::javax::swing::tree::TreePath *);
+public:
+  virtual void setSelectionPaths(JArray< ::javax::swing::tree::TreePath * > *);
+  virtual void addSelectionPath(::javax::swing::tree::TreePath *);
+  virtual void addSelectionPaths(JArray< ::javax::swing::tree::TreePath * > *);
+  virtual void removeSelectionPath(::javax::swing::tree::TreePath *);
+  virtual void removeSelectionPaths(JArray< ::javax::swing::tree::TreePath * > *);
+  virtual ::javax::swing::tree::TreePath * getSelectionPath();
+  virtual JArray< ::javax::swing::tree::TreePath * > * getSelectionPaths();
+  virtual jint getSelectionCount();
+  virtual jboolean isPathSelected(::javax::swing::tree::TreePath *);
+  virtual jboolean isSelectionEmpty();
+  virtual void clearSelection();
+  virtual void addTreeSelectionListener(::javax::swing::event::TreeSelectionListener *);
+  virtual void removeTreeSelectionListener(::javax::swing::event::TreeSelectionListener *);
+  virtual JArray< ::javax::swing::event::TreeSelectionListener * > * getTreeSelectionListeners();
+public: // actually protected
+  virtual void fireValueChanged(::javax::swing::event::TreeSelectionEvent *);
+public:
+  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
+  virtual JArray< jint > * getSelectionRows();
+  virtual jint getMinSelectionRow();
+  virtual jint getMaxSelectionRow();
+  virtual jboolean isRowSelected(jint);
+  virtual void resetRowSelection();
+  virtual jint getLeadSelectionRow();
+  virtual ::javax::swing::tree::TreePath * getLeadSelectionPath();
+  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
+  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
+  virtual JArray< ::java::beans::PropertyChangeListener * > * getPropertyChangeListeners();
+public: // actually protected
+  virtual void insureRowContinuity();
+  virtual jboolean arePathsContiguous(JArray< ::javax::swing::tree::TreePath * > *);
+  virtual jboolean canPathsBeAdded(JArray< ::javax::swing::tree::TreePath * > *);
+  virtual jboolean canPathsBeRemoved(JArray< ::javax::swing::tree::TreePath * > *);
+  virtual void notifyPathChange(::java::util::Vector *, ::javax::swing::tree::TreePath *);
+  virtual void updateLeadIndex();
+  virtual void insureUniqueness();
+public: // actually package-private
+  static const jlong serialVersionUID = 3288129636638950196LL;
+public:
+  static ::java::lang::String * SELECTION_MODE_PROPERTY;
+public: // actually protected
+  ::javax::swing::event::SwingPropertyChangeSupport * __attribute__((aligned(__alignof__( ::java::lang::Object)))) changeSupport;
+  JArray< ::javax::swing::tree::TreePath * > * selection;
+  ::javax::swing::event::EventListenerList * listenerList;
+  ::javax::swing::tree::RowMapper * rowMapper;
+  ::javax::swing::DefaultListSelectionModel * listSelectionModel;
+  jint selectionMode;
+  ::javax::swing::tree::TreePath * leadPath;
+  jint leadIndex;
+  jint leadRow;
+private:
+  ::java::util::HashSet * selectedPaths;
+  ::java::util::HashSet * tmpPaths;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_tree_DefaultTreeSelectionModel__
diff --git a/libjava/javax/swing/tree/ExpandVetoException.h b/libjava/javax/swing/tree/ExpandVetoException.h
new file mode 100644
index 000000000..174bcb897
--- /dev/null
+++ b/libjava/javax/swing/tree/ExpandVetoException.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_tree_ExpandVetoException__
+#define __javax_swing_tree_ExpandVetoException__
+
+#pragma interface
+
+#include <java/lang/Exception.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class TreeExpansionEvent;
+      }
+      namespace tree
+      {
+          class ExpandVetoException;
+      }
+    }
+  }
+}
+
+class javax::swing::tree::ExpandVetoException : public ::java::lang::Exception
+{
+
+public:
+  ExpandVetoException(::javax::swing::event::TreeExpansionEvent *);
+  ExpandVetoException(::javax::swing::event::TreeExpansionEvent *, ::java::lang::String *);
+public: // actually protected
+  ::javax::swing::event::TreeExpansionEvent * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) event;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_tree_ExpandVetoException__
diff --git a/libjava/javax/swing/tree/FixedHeightLayoutCache$NodeRecord.h b/libjava/javax/swing/tree/FixedHeightLayoutCache$NodeRecord.h
new file mode 100644
index 000000000..7d128e396
--- /dev/null
+++ b/libjava/javax/swing/tree/FixedHeightLayoutCache$NodeRecord.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_tree_FixedHeightLayoutCache$NodeRecord__
+#define __javax_swing_tree_FixedHeightLayoutCache$NodeRecord__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace tree
+      {
+          class FixedHeightLayoutCache;
+          class FixedHeightLayoutCache$NodeRecord;
+          class TreePath;
+      }
+    }
+  }
+}
+
+class javax::swing::tree::FixedHeightLayoutCache$NodeRecord : public ::java::lang::Object
+{
+
+public: // actually package-private
+  FixedHeightLayoutCache$NodeRecord(::javax::swing::tree::FixedHeightLayoutCache *, jint, jint, ::java::lang::Object *, ::java::lang::Object *);
+  virtual ::javax::swing::tree::TreePath * getPath();
+  virtual ::java::awt::Rectangle * getBounds();
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) row;
+  jint depth;
+  ::java::lang::Object * parent;
+  ::java::lang::Object * node;
+  jboolean isExpanded;
+  ::java::awt::Rectangle * bounds;
+private:
+  ::javax::swing::tree::TreePath * path;
+public: // actually package-private
+  ::javax::swing::tree::FixedHeightLayoutCache * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_tree_FixedHeightLayoutCache$NodeRecord__
diff --git a/libjava/javax/swing/tree/FixedHeightLayoutCache.h b/libjava/javax/swing/tree/FixedHeightLayoutCache.h
new file mode 100644
index 000000000..863ccd9f0
--- /dev/null
+++ b/libjava/javax/swing/tree/FixedHeightLayoutCache.h
@@ -0,0 +1,82 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_tree_FixedHeightLayoutCache__
+#define __javax_swing_tree_FixedHeightLayoutCache__
+
+#pragma interface
+
+#include <javax/swing/tree/VariableHeightLayoutCache.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class TreeModelEvent;
+      }
+      namespace tree
+      {
+          class FixedHeightLayoutCache;
+          class TreeModel;
+          class TreePath;
+      }
+    }
+  }
+}
+
+class javax::swing::tree::FixedHeightLayoutCache : public ::javax::swing::tree::VariableHeightLayoutCache
+{
+
+public:
+  FixedHeightLayoutCache();
+  virtual jint getRowCount();
+private:
+  void update();
+  void countRows(::java::lang::Object *, ::java::lang::Object *, jint);
+public:
+  virtual void invalidatePathBounds(::javax::swing::tree::TreePath *);
+  virtual void invalidateSizes();
+  virtual void setExpandedState(::javax::swing::tree::TreePath *, jboolean);
+  virtual jboolean isExpanded(::javax::swing::tree::TreePath *);
+  virtual ::java::awt::Rectangle * getBounds(::javax::swing::tree::TreePath *, ::java::awt::Rectangle *);
+  virtual ::javax::swing::tree::TreePath * getPathForRow(jint);
+  virtual jint getRowForPath(::javax::swing::tree::TreePath *);
+  virtual ::javax::swing::tree::TreePath * getPathClosestTo(jint, jint);
+public: // actually package-private
+  virtual jint distance(::java::awt::Rectangle *, jint, jint);
+public:
+  virtual jint getVisibleChildCount(::javax::swing::tree::TreePath *);
+  virtual ::java::util::Enumeration * getVisiblePathsFrom(::javax::swing::tree::TreePath *);
+  virtual jboolean getExpandedState(::javax::swing::tree::TreePath *);
+  virtual void treeNodesChanged(::javax::swing::event::TreeModelEvent *);
+  virtual void treeNodesInserted(::javax::swing::event::TreeModelEvent *);
+  virtual void treeNodesRemoved(::javax::swing::event::TreeModelEvent *);
+  virtual void treeStructureChanged(::javax::swing::event::TreeModelEvent *);
+  virtual void setModel(::javax::swing::tree::TreeModel *);
+  virtual void setRootVisible(jboolean);
+  virtual jint getPreferredHeight();
+  virtual jint getPreferredWidth(::java::awt::Rectangle *);
+public: // actually protected
+  virtual jboolean isFixedRowHeight();
+public: // actually package-private
+  ::java::util::Set * __attribute__((aligned(__alignof__( ::javax::swing::tree::VariableHeightLayoutCache)))) expanded;
+  ::java::util::Hashtable * nodes;
+  ::java::util::Hashtable * row2node;
+  jboolean dirty;
+  jint totalHeight;
+  jint maximalWidth;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_tree_FixedHeightLayoutCache__
diff --git a/libjava/javax/swing/tree/MutableTreeNode.h b/libjava/javax/swing/tree/MutableTreeNode.h
new file mode 100644
index 000000000..221f6750d
--- /dev/null
+++ b/libjava/javax/swing/tree/MutableTreeNode.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_tree_MutableTreeNode__
+#define __javax_swing_tree_MutableTreeNode__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace tree
+      {
+          class MutableTreeNode;
+          class TreeNode;
+      }
+    }
+  }
+}
+
+class javax::swing::tree::MutableTreeNode : public ::java::lang::Object
+{
+
+public:
+  virtual void insert(::javax::swing::tree::MutableTreeNode *, jint) = 0;
+  virtual void remove(jint) = 0;
+  virtual void remove(::javax::swing::tree::MutableTreeNode *) = 0;
+  virtual void setUserObject(::java::lang::Object *) = 0;
+  virtual void removeFromParent() = 0;
+  virtual void setParent(::javax::swing::tree::MutableTreeNode *) = 0;
+  virtual ::javax::swing::tree::TreeNode * getParent() = 0;
+  virtual jint getIndex(::javax::swing::tree::TreeNode *) = 0;
+  virtual ::javax::swing::tree::TreeNode * getChildAt(jint) = 0;
+  virtual jint getChildCount() = 0;
+  virtual jboolean getAllowsChildren() = 0;
+  virtual jboolean isLeaf() = 0;
+  virtual ::java::util::Enumeration * children() = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_tree_MutableTreeNode__
diff --git a/libjava/javax/swing/tree/RowMapper.h b/libjava/javax/swing/tree/RowMapper.h
new file mode 100644
index 000000000..d7310d3fc
--- /dev/null
+++ b/libjava/javax/swing/tree/RowMapper.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_tree_RowMapper__
+#define __javax_swing_tree_RowMapper__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace tree
+      {
+          class RowMapper;
+          class TreePath;
+      }
+    }
+  }
+}
+
+class javax::swing::tree::RowMapper : public ::java::lang::Object
+{
+
+public:
+  virtual JArray< jint > * getRowsForPaths(JArray< ::javax::swing::tree::TreePath * > *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_tree_RowMapper__
diff --git a/libjava/javax/swing/tree/TreeCellEditor.h b/libjava/javax/swing/tree/TreeCellEditor.h
new file mode 100644
index 000000000..0b18ec605
--- /dev/null
+++ b/libjava/javax/swing/tree/TreeCellEditor.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_tree_TreeCellEditor__
+#define __javax_swing_tree_TreeCellEditor__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JTree;
+      namespace event
+      {
+          class CellEditorListener;
+      }
+      namespace tree
+      {
+          class TreeCellEditor;
+      }
+    }
+  }
+}
+
+class javax::swing::tree::TreeCellEditor : public ::java::lang::Object
+{
+
+public:
+  virtual ::java::awt::Component * getTreeCellEditorComponent(::javax::swing::JTree *, ::java::lang::Object *, jboolean, jboolean, jboolean, jint) = 0;
+  virtual ::java::lang::Object * getCellEditorValue() = 0;
+  virtual jboolean isCellEditable(::java::util::EventObject *) = 0;
+  virtual jboolean shouldSelectCell(::java::util::EventObject *) = 0;
+  virtual jboolean stopCellEditing() = 0;
+  virtual void cancelCellEditing() = 0;
+  virtual void addCellEditorListener(::javax::swing::event::CellEditorListener *) = 0;
+  virtual void removeCellEditorListener(::javax::swing::event::CellEditorListener *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_tree_TreeCellEditor__
diff --git a/libjava/javax/swing/tree/TreeCellRenderer.h b/libjava/javax/swing/tree/TreeCellRenderer.h
new file mode 100644
index 000000000..2043386d1
--- /dev/null
+++ b/libjava/javax/swing/tree/TreeCellRenderer.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_tree_TreeCellRenderer__
+#define __javax_swing_tree_TreeCellRenderer__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Component;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+        class JTree;
+      namespace tree
+      {
+          class TreeCellRenderer;
+      }
+    }
+  }
+}
+
+class javax::swing::tree::TreeCellRenderer : public ::java::lang::Object
+{
+
+public:
+  virtual ::java::awt::Component * getTreeCellRendererComponent(::javax::swing::JTree *, ::java::lang::Object *, jboolean, jboolean, jboolean, jint, jboolean) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_tree_TreeCellRenderer__
diff --git a/libjava/javax/swing/tree/TreeModel.h b/libjava/javax/swing/tree/TreeModel.h
new file mode 100644
index 000000000..981d53fb5
--- /dev/null
+++ b/libjava/javax/swing/tree/TreeModel.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_tree_TreeModel__
+#define __javax_swing_tree_TreeModel__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class TreeModelListener;
+      }
+      namespace tree
+      {
+          class TreeModel;
+          class TreePath;
+      }
+    }
+  }
+}
+
+class javax::swing::tree::TreeModel : public ::java::lang::Object
+{
+
+public:
+  virtual ::java::lang::Object * getRoot() = 0;
+  virtual ::java::lang::Object * getChild(::java::lang::Object *, jint) = 0;
+  virtual jint getChildCount(::java::lang::Object *) = 0;
+  virtual jboolean isLeaf(::java::lang::Object *) = 0;
+  virtual void valueForPathChanged(::javax::swing::tree::TreePath *, ::java::lang::Object *) = 0;
+  virtual jint getIndexOfChild(::java::lang::Object *, ::java::lang::Object *) = 0;
+  virtual void addTreeModelListener(::javax::swing::event::TreeModelListener *) = 0;
+  virtual void removeTreeModelListener(::javax::swing::event::TreeModelListener *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_tree_TreeModel__
diff --git a/libjava/javax/swing/tree/TreeNode.h b/libjava/javax/swing/tree/TreeNode.h
new file mode 100644
index 000000000..3307c09c6
--- /dev/null
+++ b/libjava/javax/swing/tree/TreeNode.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_tree_TreeNode__
+#define __javax_swing_tree_TreeNode__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace tree
+      {
+          class TreeNode;
+      }
+    }
+  }
+}
+
+class javax::swing::tree::TreeNode : public ::java::lang::Object
+{
+
+public:
+  virtual ::javax::swing::tree::TreeNode * getParent() = 0;
+  virtual jint getIndex(::javax::swing::tree::TreeNode *) = 0;
+  virtual ::javax::swing::tree::TreeNode * getChildAt(jint) = 0;
+  virtual jint getChildCount() = 0;
+  virtual jboolean getAllowsChildren() = 0;
+  virtual jboolean isLeaf() = 0;
+  virtual ::java::util::Enumeration * children() = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_tree_TreeNode__
diff --git a/libjava/javax/swing/tree/TreePath.h b/libjava/javax/swing/tree/TreePath.h
new file mode 100644
index 000000000..9c99e2720
--- /dev/null
+++ b/libjava/javax/swing/tree/TreePath.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_tree_TreePath__
+#define __javax_swing_tree_TreePath__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace tree
+      {
+          class TreePath;
+      }
+    }
+  }
+}
+
+class javax::swing::tree::TreePath : public ::java::lang::Object
+{
+
+public:
+  TreePath(JArray< ::java::lang::Object * > *);
+  TreePath(::java::lang::Object *);
+public: // actually protected
+  TreePath(::javax::swing::tree::TreePath *, ::java::lang::Object *);
+  TreePath(JArray< ::java::lang::Object * > *, jint);
+  TreePath();
+public:
+  virtual jint hashCode();
+  virtual jboolean equals(::java::lang::Object *);
+  virtual ::java::lang::String * toString();
+  virtual JArray< ::java::lang::Object * > * getPath();
+  virtual ::java::lang::Object * getLastPathComponent();
+  virtual jint getPathCount();
+  virtual ::java::lang::Object * getPathComponent(jint);
+  virtual jboolean isDescendant(::javax::swing::tree::TreePath *);
+  virtual ::javax::swing::tree::TreePath * pathByAddingChild(::java::lang::Object *);
+  virtual ::javax::swing::tree::TreePath * getParentPath();
+public: // actually package-private
+  static const jlong serialVersionUID = 4380036194768077479LL;
+private:
+  JArray< ::java::lang::Object * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) path;
+  ::javax::swing::tree::TreePath * parentPath;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_tree_TreePath__
diff --git a/libjava/javax/swing/tree/TreeSelectionModel.h b/libjava/javax/swing/tree/TreeSelectionModel.h
new file mode 100644
index 000000000..3c0194d18
--- /dev/null
+++ b/libjava/javax/swing/tree/TreeSelectionModel.h
@@ -0,0 +1,76 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_tree_TreeSelectionModel__
+#define __javax_swing_tree_TreeSelectionModel__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace beans
+    {
+        class PropertyChangeListener;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class TreeSelectionListener;
+      }
+      namespace tree
+      {
+          class RowMapper;
+          class TreePath;
+          class TreeSelectionModel;
+      }
+    }
+  }
+}
+
+class javax::swing::tree::TreeSelectionModel : public ::java::lang::Object
+{
+
+public:
+  virtual void setSelectionMode(jint) = 0;
+  virtual jint getSelectionMode() = 0;
+  virtual void setSelectionPath(::javax::swing::tree::TreePath *) = 0;
+  virtual void setSelectionPaths(JArray< ::javax::swing::tree::TreePath * > *) = 0;
+  virtual void addSelectionPath(::javax::swing::tree::TreePath *) = 0;
+  virtual void addSelectionPaths(JArray< ::javax::swing::tree::TreePath * > *) = 0;
+  virtual void removeSelectionPath(::javax::swing::tree::TreePath *) = 0;
+  virtual void removeSelectionPaths(JArray< ::javax::swing::tree::TreePath * > *) = 0;
+  virtual ::javax::swing::tree::TreePath * getSelectionPath() = 0;
+  virtual JArray< ::javax::swing::tree::TreePath * > * getSelectionPaths() = 0;
+  virtual jint getSelectionCount() = 0;
+  virtual jboolean isPathSelected(::javax::swing::tree::TreePath *) = 0;
+  virtual jboolean isSelectionEmpty() = 0;
+  virtual void clearSelection() = 0;
+  virtual void setRowMapper(::javax::swing::tree::RowMapper *) = 0;
+  virtual ::javax::swing::tree::RowMapper * getRowMapper() = 0;
+  virtual JArray< jint > * getSelectionRows() = 0;
+  virtual jint getMinSelectionRow() = 0;
+  virtual jint getMaxSelectionRow() = 0;
+  virtual jboolean isRowSelected(jint) = 0;
+  virtual void resetRowSelection() = 0;
+  virtual jint getLeadSelectionRow() = 0;
+  virtual ::javax::swing::tree::TreePath * getLeadSelectionPath() = 0;
+  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *) = 0;
+  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *) = 0;
+  virtual void addTreeSelectionListener(::javax::swing::event::TreeSelectionListener *) = 0;
+  virtual void removeTreeSelectionListener(::javax::swing::event::TreeSelectionListener *) = 0;
+  static const jint SINGLE_TREE_SELECTION = 1;
+  static const jint CONTIGUOUS_TREE_SELECTION = 2;
+  static const jint DISCONTIGUOUS_TREE_SELECTION = 4;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_tree_TreeSelectionModel__
diff --git a/libjava/javax/swing/tree/VariableHeightLayoutCache$NodeRecord.h b/libjava/javax/swing/tree/VariableHeightLayoutCache$NodeRecord.h
new file mode 100644
index 000000000..1555726c9
--- /dev/null
+++ b/libjava/javax/swing/tree/VariableHeightLayoutCache$NodeRecord.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_tree_VariableHeightLayoutCache$NodeRecord__
+#define __javax_swing_tree_VariableHeightLayoutCache$NodeRecord__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace tree
+      {
+          class TreePath;
+          class VariableHeightLayoutCache;
+          class VariableHeightLayoutCache$NodeRecord;
+      }
+    }
+  }
+}
+
+class javax::swing::tree::VariableHeightLayoutCache$NodeRecord : public ::java::lang::Object
+{
+
+public: // actually package-private
+  VariableHeightLayoutCache$NodeRecord(::javax::swing::tree::VariableHeightLayoutCache *, jint, jint, ::java::lang::Object *, ::java::lang::Object *);
+  virtual ::javax::swing::tree::TreePath * getPath();
+  virtual ::java::awt::Rectangle * getBounds();
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) row;
+  jint depth;
+  ::java::lang::Object * parent;
+  ::java::lang::Object * node;
+  jboolean isExpanded;
+  ::java::awt::Rectangle * bounds;
+private:
+  ::javax::swing::tree::TreePath * path;
+public: // actually package-private
+  ::javax::swing::tree::VariableHeightLayoutCache * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_tree_VariableHeightLayoutCache$NodeRecord__
diff --git a/libjava/javax/swing/tree/VariableHeightLayoutCache.h b/libjava/javax/swing/tree/VariableHeightLayoutCache.h
new file mode 100644
index 000000000..81a85bad4
--- /dev/null
+++ b/libjava/javax/swing/tree/VariableHeightLayoutCache.h
@@ -0,0 +1,85 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_tree_VariableHeightLayoutCache__
+#define __javax_swing_tree_VariableHeightLayoutCache__
+
+#pragma interface
+
+#include <javax/swing/tree/AbstractLayoutCache.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Rectangle;
+    }
+  }
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class TreeModelEvent;
+      }
+      namespace tree
+      {
+          class AbstractLayoutCache$NodeDimensions;
+          class TreeModel;
+          class TreePath;
+          class VariableHeightLayoutCache;
+      }
+    }
+  }
+}
+
+class javax::swing::tree::VariableHeightLayoutCache : public ::javax::swing::tree::AbstractLayoutCache
+{
+
+public:
+  VariableHeightLayoutCache();
+  virtual jint getRowCount();
+private:
+  void update();
+  jint countRows(::java::lang::Object *, ::java::lang::Object *, jint, jint);
+public:
+  virtual void invalidatePathBounds(::javax::swing::tree::TreePath *);
+  virtual void invalidateSizes();
+  virtual void setExpandedState(::javax::swing::tree::TreePath *, jboolean);
+  virtual jboolean isExpanded(::javax::swing::tree::TreePath *);
+  virtual ::java::awt::Rectangle * getBounds(::javax::swing::tree::TreePath *, ::java::awt::Rectangle *);
+  virtual ::javax::swing::tree::TreePath * getPathForRow(jint);
+  virtual jint getRowForPath(::javax::swing::tree::TreePath *);
+  virtual ::javax::swing::tree::TreePath * getPathClosestTo(jint, jint);
+public: // actually package-private
+  virtual jint distance(::java::awt::Rectangle *, jint, jint);
+public:
+  virtual jint getVisibleChildCount(::javax::swing::tree::TreePath *);
+  virtual ::java::util::Enumeration * getVisiblePathsFrom(::javax::swing::tree::TreePath *);
+  virtual jboolean getExpandedState(::javax::swing::tree::TreePath *);
+  virtual void treeNodesChanged(::javax::swing::event::TreeModelEvent *);
+  virtual void treeNodesInserted(::javax::swing::event::TreeModelEvent *);
+  virtual void treeNodesRemoved(::javax::swing::event::TreeModelEvent *);
+  virtual void treeStructureChanged(::javax::swing::event::TreeModelEvent *);
+  virtual void setModel(::javax::swing::tree::TreeModel *);
+  virtual void setRootVisible(jboolean);
+  virtual jint getPreferredHeight();
+  virtual jint getPreferredWidth(::java::awt::Rectangle *);
+  virtual void setNodeDimensions(::javax::swing::tree::AbstractLayoutCache$NodeDimensions *);
+  virtual void setRowHeight(jint);
+private:
+  static ::java::awt::Rectangle * RECT_CACHE;
+public: // actually package-private
+  ::java::util::Set * __attribute__((aligned(__alignof__( ::javax::swing::tree::AbstractLayoutCache)))) expanded;
+  ::java::util::Hashtable * nodes;
+  ::java::util::ArrayList * row2node;
+  jboolean dirty;
+  jint totalHeight;
+  jint maximalWidth;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_tree_VariableHeightLayoutCache__
diff --git a/libjava/javax/swing/undo/AbstractUndoableEdit.h b/libjava/javax/swing/undo/AbstractUndoableEdit.h
new file mode 100644
index 000000000..e800a690f
--- /dev/null
+++ b/libjava/javax/swing/undo/AbstractUndoableEdit.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_undo_AbstractUndoableEdit__
+#define __javax_swing_undo_AbstractUndoableEdit__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace undo
+      {
+          class AbstractUndoableEdit;
+          class UndoableEdit;
+      }
+    }
+  }
+}
+
+class javax::swing::undo::AbstractUndoableEdit : public ::java::lang::Object
+{
+
+public:
+  AbstractUndoableEdit();
+  virtual void undo();
+  virtual jboolean canUndo();
+  virtual void redo();
+  virtual jboolean canRedo();
+  virtual void die();
+  virtual jboolean addEdit(::javax::swing::undo::UndoableEdit *);
+  virtual jboolean replaceEdit(::javax::swing::undo::UndoableEdit *);
+  virtual jboolean isSignificant();
+  virtual ::java::lang::String * getPresentationName();
+  virtual ::java::lang::String * getUndoPresentationName();
+  virtual ::java::lang::String * getRedoPresentationName();
+  virtual ::java::lang::String * toString();
+public: // actually package-private
+  static const jlong serialVersionUID = 580150227676302096LL;
+public: // actually protected
+  static ::java::lang::String * UndoName;
+  static ::java::lang::String * RedoName;
+private:
+  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) hasBeenDone;
+  jboolean alive;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_undo_AbstractUndoableEdit__
diff --git a/libjava/javax/swing/undo/CannotRedoException.h b/libjava/javax/swing/undo/CannotRedoException.h
new file mode 100644
index 000000000..5d20d8d7a
--- /dev/null
+++ b/libjava/javax/swing/undo/CannotRedoException.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_undo_CannotRedoException__
+#define __javax_swing_undo_CannotRedoException__
+
+#pragma interface
+
+#include <java/lang/RuntimeException.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace undo
+      {
+          class CannotRedoException;
+      }
+    }
+  }
+}
+
+class javax::swing::undo::CannotRedoException : public ::java::lang::RuntimeException
+{
+
+public:
+  CannotRedoException();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_undo_CannotRedoException__
diff --git a/libjava/javax/swing/undo/CannotUndoException.h b/libjava/javax/swing/undo/CannotUndoException.h
new file mode 100644
index 000000000..d7a3cb2c2
--- /dev/null
+++ b/libjava/javax/swing/undo/CannotUndoException.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_undo_CannotUndoException__
+#define __javax_swing_undo_CannotUndoException__
+
+#pragma interface
+
+#include <java/lang/RuntimeException.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace undo
+      {
+          class CannotUndoException;
+      }
+    }
+  }
+}
+
+class javax::swing::undo::CannotUndoException : public ::java::lang::RuntimeException
+{
+
+public:
+  CannotUndoException();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_undo_CannotUndoException__
diff --git a/libjava/javax/swing/undo/CompoundEdit.h b/libjava/javax/swing/undo/CompoundEdit.h
new file mode 100644
index 000000000..9c8905384
--- /dev/null
+++ b/libjava/javax/swing/undo/CompoundEdit.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_undo_CompoundEdit__
+#define __javax_swing_undo_CompoundEdit__
+
+#pragma interface
+
+#include <javax/swing/undo/AbstractUndoableEdit.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace undo
+      {
+          class CompoundEdit;
+          class UndoableEdit;
+      }
+    }
+  }
+}
+
+class javax::swing::undo::CompoundEdit : public ::javax::swing::undo::AbstractUndoableEdit
+{
+
+public:
+  CompoundEdit();
+  virtual void undo();
+  virtual void redo();
+public: // actually protected
+  virtual ::javax::swing::undo::UndoableEdit * lastEdit();
+public:
+  virtual void die();
+  virtual jboolean addEdit(::javax::swing::undo::UndoableEdit *);
+  virtual void end();
+  virtual jboolean canUndo();
+  virtual jboolean canRedo();
+  virtual jboolean isInProgress();
+  virtual jboolean isSignificant();
+  virtual ::java::lang::String * getPresentationName();
+  virtual ::java::lang::String * getUndoPresentationName();
+  virtual ::java::lang::String * getRedoPresentationName();
+  virtual ::java::lang::String * toString();
+private:
+  static const jlong serialVersionUID = -6512679249930119683LL;
+public: // actually protected
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::undo::AbstractUndoableEdit)))) edits;
+private:
+  jboolean inProgress;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_undo_CompoundEdit__
diff --git a/libjava/javax/swing/undo/StateEdit.h b/libjava/javax/swing/undo/StateEdit.h
new file mode 100644
index 000000000..80c91588e
--- /dev/null
+++ b/libjava/javax/swing/undo/StateEdit.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_undo_StateEdit__
+#define __javax_swing_undo_StateEdit__
+
+#pragma interface
+
+#include <javax/swing/undo/AbstractUndoableEdit.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace undo
+      {
+          class StateEdit;
+          class StateEditable;
+      }
+    }
+  }
+}
+
+class javax::swing::undo::StateEdit : public ::javax::swing::undo::AbstractUndoableEdit
+{
+
+public:
+  StateEdit(::javax::swing::undo::StateEditable *);
+  StateEdit(::javax::swing::undo::StateEditable *, ::java::lang::String *);
+public: // actually protected
+  virtual void init(::javax::swing::undo::StateEditable *, ::java::lang::String *);
+public:
+  virtual void end();
+  virtual void undo();
+  virtual void redo();
+  virtual ::java::lang::String * getPresentationName();
+public: // actually protected
+  virtual void removeRedundantState();
+  static ::java::lang::String * RCSID;
+  ::javax::swing::undo::StateEditable * __attribute__((aligned(__alignof__( ::javax::swing::undo::AbstractUndoableEdit)))) object;
+  ::java::util::Hashtable * preState;
+  ::java::util::Hashtable * postState;
+  ::java::lang::String * undoRedoName;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_undo_StateEdit__
diff --git a/libjava/javax/swing/undo/StateEditable.h b/libjava/javax/swing/undo/StateEditable.h
new file mode 100644
index 000000000..0f1343ab8
--- /dev/null
+++ b/libjava/javax/swing/undo/StateEditable.h
@@ -0,0 +1,34 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_undo_StateEditable__
+#define __javax_swing_undo_StateEditable__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace undo
+      {
+          class StateEditable;
+      }
+    }
+  }
+}
+
+class javax::swing::undo::StateEditable : public ::java::lang::Object
+{
+
+public:
+  virtual void restoreState(::java::util::Hashtable *) = 0;
+  virtual void storeState(::java::util::Hashtable *) = 0;
+  static ::java::lang::String * RCSID;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_undo_StateEditable__
diff --git a/libjava/javax/swing/undo/UndoManager.h b/libjava/javax/swing/undo/UndoManager.h
new file mode 100644
index 000000000..9189c1c0b
--- /dev/null
+++ b/libjava/javax/swing/undo/UndoManager.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_undo_UndoManager__
+#define __javax_swing_undo_UndoManager__
+
+#pragma interface
+
+#include <javax/swing/undo/CompoundEdit.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class UndoableEditEvent;
+      }
+      namespace undo
+      {
+          class UndoManager;
+          class UndoableEdit;
+      }
+    }
+  }
+}
+
+class javax::swing::undo::UndoManager : public ::javax::swing::undo::CompoundEdit
+{
+
+public:
+  UndoManager();
+  virtual ::java::lang::String * toString();
+  virtual void end();
+  virtual jint getLimit();
+  virtual void setLimit(jint);
+  virtual void discardAllEdits();
+public: // actually protected
+  virtual void trimForLimit();
+  virtual void trimEdits(jint, jint);
+  virtual ::javax::swing::undo::UndoableEdit * editToBeUndone();
+  virtual ::javax::swing::undo::UndoableEdit * editToBeRedone();
+  virtual void undoTo(::javax::swing::undo::UndoableEdit *);
+  virtual void redoTo(::javax::swing::undo::UndoableEdit *);
+public:
+  virtual void undoOrRedo();
+  virtual jboolean canUndoOrRedo();
+  virtual void undo();
+  virtual jboolean canUndo();
+  virtual void redo();
+  virtual jboolean canRedo();
+  virtual jboolean addEdit(::javax::swing::undo::UndoableEdit *);
+  virtual ::java::lang::String * getUndoOrRedoPresentationName();
+  virtual ::java::lang::String * getUndoPresentationName();
+  virtual ::java::lang::String * getRedoPresentationName();
+  virtual void undoableEditHappened(::javax::swing::event::UndoableEditEvent *);
+public: // actually package-private
+  static const jlong serialVersionUID = -2077529998244066750LL;
+  jint __attribute__((aligned(__alignof__( ::javax::swing::undo::CompoundEdit)))) indexOfNextAdd;
+  jint limit;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_undo_UndoManager__
diff --git a/libjava/javax/swing/undo/UndoableEdit.h b/libjava/javax/swing/undo/UndoableEdit.h
new file mode 100644
index 000000000..59b73543d
--- /dev/null
+++ b/libjava/javax/swing/undo/UndoableEdit.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_undo_UndoableEdit__
+#define __javax_swing_undo_UndoableEdit__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace undo
+      {
+          class UndoableEdit;
+      }
+    }
+  }
+}
+
+class javax::swing::undo::UndoableEdit : public ::java::lang::Object
+{
+
+public:
+  virtual jboolean addEdit(::javax::swing::undo::UndoableEdit *) = 0;
+  virtual jboolean canRedo() = 0;
+  virtual jboolean canUndo() = 0;
+  virtual void die() = 0;
+  virtual ::java::lang::String * getPresentationName() = 0;
+  virtual ::java::lang::String * getRedoPresentationName() = 0;
+  virtual ::java::lang::String * getUndoPresentationName() = 0;
+  virtual jboolean isSignificant() = 0;
+  virtual void redo() = 0;
+  virtual jboolean replaceEdit(::javax::swing::undo::UndoableEdit *) = 0;
+  virtual void undo() = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_swing_undo_UndoableEdit__
diff --git a/libjava/javax/swing/undo/UndoableEditSupport.h b/libjava/javax/swing/undo/UndoableEditSupport.h
new file mode 100644
index 000000000..3bfbe30b7
--- /dev/null
+++ b/libjava/javax/swing/undo/UndoableEditSupport.h
@@ -0,0 +1,61 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_swing_undo_UndoableEditSupport__
+#define __javax_swing_undo_UndoableEditSupport__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace swing
+    {
+      namespace event
+      {
+          class UndoableEditListener;
+      }
+      namespace undo
+      {
+          class CompoundEdit;
+          class UndoableEdit;
+          class UndoableEditSupport;
+      }
+    }
+  }
+}
+
+class javax::swing::undo::UndoableEditSupport : public ::java::lang::Object
+{
+
+public:
+  UndoableEditSupport();
+  UndoableEditSupport(::java::lang::Object *);
+  virtual ::java::lang::String * toString();
+  virtual void addUndoableEditListener(::javax::swing::event::UndoableEditListener *);
+  virtual void removeUndoableEditListener(::javax::swing::event::UndoableEditListener *);
+  virtual JArray< ::javax::swing::event::UndoableEditListener * > * getUndoableEditListeners();
+public: // actually protected
+  virtual void _postEdit(::javax::swing::undo::UndoableEdit *);
+public:
+  virtual void postEdit(::javax::swing::undo::UndoableEdit *);
+  virtual jint getUpdateLevel();
+  virtual void beginUpdate();
+public: // actually protected
+  virtual ::javax::swing::undo::CompoundEdit * createCompoundEdit();
+public:
+  virtual void endUpdate();
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) updateLevel;
+  ::javax::swing::undo::CompoundEdit * compoundEdit;
+  ::java::util::Vector * listeners;
+  ::java::lang::Object * realSource;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_swing_undo_UndoableEditSupport__