libjava/classpath/ChangeLog.gcj:

2007-05-31  Matthias Klose  <doko@ubuntu.com>

        * javax/management/NotificationBroadcasterSupport.java
        (getNotificationInfo): Add cast.
        * native/jni/qt-peer/Makefile.am (AM_CXXFLAGS): Add libstdc++ include
        directories.
        * native/jni/qt-peer/Makefile.in: Regenerate.

libjava/ChangeLog:

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        * java/io/natFileWin32.cc (setFilePermissions): New (stub only).
        _access: Handle EXEC query, stub only.

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        Merged from classpath:
        * gnu/java/nio/SelectorProviderImpl.java: Whitespace merge.
        * java/lang/System.java(inheritedChannel): New.
        * java/lang/Character.java: Remove stray`;'.
        * java/net/MulticastSocket.java: Merged.
        * java/text/DateFormatSymbols.java(getInstance): New, comment updates.
        * java/text/Collator.java(getInstance): Merged.
        * java/util/Calendar.java: New attributes ALL_STYLES, SHORT, LONG.
        getDisplayName, getDisplayNames: New.
        * java/util/logging/Logger.java: Merged.
        * Regenerate .class and .h files.

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        * java/io/File.java: Merge with classpath-0.95, new method
        setFilePermissions, new attribute EXEC.
        * java/io/natFilePosix.cc (setFilePermissions): New.
        _access: Handle EXEC query.
        * classpath/lib/java/io/File.class, java/io/File.h: Regenerate.

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        Imported GNU Classpath 0.95.

        * classpath/Makefile.in,
        classpath/native/jni/midi-dssi/Makefile.in,
        classpath/native/jni/classpath/Makefile.in,
        classpath/native/jni/Makefile.in,
        classpath/native/jni/gconf-peer/Makefile.in,
        classpath/native/jni/java-io/Makefile.in,
        classpath/native/jni/native-lib/Makefile.in,
        classpath/native/jni/java-util/Makefile.in,
        classpath/native/jni/midi-alsa/Makefile.in,
        classpath/native/jni/java-lang/Makefile.in,
        classpath/native/jni/java-nio/Makefile.in,
        classpath/native/jni/java-net/Makefile.in,
        classpath/native/jni/xmlj/Makefile.in,
        classpath/native/jni/qt-peer/Makefile.in,
        classpath/native/jni/gtk-peer/Makefile.in,
        classpath/native/Makefile.in, classpath/native/jawt/Makefile.in,
        classpath/native/fdlibm/Makefile.in,
        classpath/native/plugin/Makefile.in,
        classpath/resource/Makefile.in, classpath/scripts/Makefile.in,
        classpath/tools/Makefile.in, classpath/doc/Makefile.in,
        classpath/doc/api/Makefile.in, classpath/lib/Makefile.in,
        classpath/external/Makefile.in, classpath/external/jsr166/Makefile.in,
        classpath/external/sax/Makefile.in,
        classpath/external/w3c_dom/Makefile.in,
        classpath/external/relaxngDatatype/Makefile.in,
        classpath/include/Makefile.in,
        classpath/examples/Makefile.in: Regenerate.
        * classpath/config.guess, classpath/config.sub,
        classpath/ltmain.sh : Update.
        * classpath/configure, classpath/depcomp, classpath/missing,
        classpath/aclocal.m4, classpath/install-sh: Regenerate.

        * gnu/classpath/Configuration.java (CLASSPATH_VERSION): Now 0.95.
        * sources.am: Regenerate.
        * Makefile.in: Regenerate.

        * Update the .class files and generated CNI header files, add new
        .class and generated CNI header files.
        * Remove generated files for removed java source files:
        classpath/gnu/java/net/BASE64.java,
        classpath/gnu/java/security/util/Base64.java,
        classpath/gnu/java/awt/peer/gtk/GThreadMutex.java,
        classpath/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java,
        classpath/gnu/java/awt/font/autofit/Scaler.java,
        classpath/gnu/classpath/jdwp/util/Value.java,
        classpath/gnu/javax/net/ssl/Base64.java.
        * Remove empty directories.

        * Makefile.am(nat_source_files): Add natVMOperatingSystemMXBeanImpl.cc.
        * java/lang/Class.java(setAccessible): Merge from classpath.
        * java/util/Locale.java: Remove.
        * gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java,
        gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc: New.
        * gcj/javaprims.h: Update class declarations.
        * scripts/classes.pl: Update usage.
        * HACKING: Mention to build all peers.


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

67 files changed, 1622 insertions, 598 deletions

diff --git a/libjava/javax/activity/ActivityCompletedException.h b/libjava/javax/activity/ActivityCompletedException.h
new file mode 100644
index 00000000000..b7508118ad0
--- /dev/null
+++ b/libjava/javax/activity/ActivityCompletedException.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_activity_ActivityCompletedException__
+#define __javax_activity_ActivityCompletedException__
+
+#pragma interface
+
+#include <java/rmi/RemoteException.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace activity
+    {
+        class ActivityCompletedException;
+    }
+  }
+}
+
+class javax::activity::ActivityCompletedException : public ::java::rmi::RemoteException
+{
+
+public:
+  ActivityCompletedException();
+  ActivityCompletedException(::java::lang::String *);
+  ActivityCompletedException(::java::lang::Throwable *);
+  ActivityCompletedException(::java::lang::String *, ::java::lang::Throwable *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_activity_ActivityCompletedException__
diff --git a/libjava/javax/activity/ActivityRequiredException.h b/libjava/javax/activity/ActivityRequiredException.h
new file mode 100644
index 00000000000..93c10f5f934
--- /dev/null
+++ b/libjava/javax/activity/ActivityRequiredException.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_activity_ActivityRequiredException__
+#define __javax_activity_ActivityRequiredException__
+
+#pragma interface
+
+#include <java/rmi/RemoteException.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace activity
+    {
+        class ActivityRequiredException;
+    }
+  }
+}
+
+class javax::activity::ActivityRequiredException : public ::java::rmi::RemoteException
+{
+
+public:
+  ActivityRequiredException();
+  ActivityRequiredException(::java::lang::String *);
+  ActivityRequiredException(::java::lang::Throwable *);
+  ActivityRequiredException(::java::lang::String *, ::java::lang::Throwable *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_activity_ActivityRequiredException__
diff --git a/libjava/javax/activity/InvalidActivityException.h b/libjava/javax/activity/InvalidActivityException.h
new file mode 100644
index 00000000000..930192bcd8d
--- /dev/null
+++ b/libjava/javax/activity/InvalidActivityException.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_activity_InvalidActivityException__
+#define __javax_activity_InvalidActivityException__
+
+#pragma interface
+
+#include <java/rmi/RemoteException.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace activity
+    {
+        class InvalidActivityException;
+    }
+  }
+}
+
+class javax::activity::InvalidActivityException : public ::java::rmi::RemoteException
+{
+
+public:
+  InvalidActivityException();
+  InvalidActivityException(::java::lang::String *);
+  InvalidActivityException(::java::lang::Throwable *);
+  InvalidActivityException(::java::lang::String *, ::java::lang::Throwable *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_activity_InvalidActivityException__
diff --git a/libjava/javax/imageio/stream/FileCacheImageOutputStream.h b/libjava/javax/imageio/stream/FileCacheImageOutputStream.h
index 30659671227..c473085e903 100644
--- a/libjava/javax/imageio/stream/FileCacheImageOutputStream.h
+++ b/libjava/javax/imageio/stream/FileCacheImageOutputStream.h
@@ -29,9 +29,6 @@ class javax::imageio::stream::FileCacheImageOutputStream : public ::javax::image
 public:
   FileCacheImageOutputStream(::java::io::OutputStream *, ::java::io::File *);
   virtual void close();
-private:
-  void checkStreamClosed();
-public:
   virtual jboolean isCached();
   virtual jboolean isCachedFile();
   virtual jboolean isCachedMemory();
@@ -39,9 +36,14 @@ public:
   virtual jint read(JArray< jbyte > *, jint, jint);
   virtual void write(JArray< jbyte > *, jint, jint);
   virtual void write(jint);
+  virtual jlong length();
+  virtual void seek(jlong);
+  virtual void flushBefore(jlong);
 private:
   ::java::io::OutputStream * __attribute__((aligned(__alignof__( ::javax::imageio::stream::ImageOutputStreamImpl)))) stream;
-  ::java::io::File * cacheDir;
+  ::java::io::File * cacheFile;
+  ::java::io::RandomAccessFile * cache;
+  jlong maxPos;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/javax/management/AttributeChangeNotification.h b/libjava/javax/management/AttributeChangeNotification.h
new file mode 100644
index 00000000000..ca37cd389f4
--- /dev/null
+++ b/libjava/javax/management/AttributeChangeNotification.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_management_AttributeChangeNotification__
+#define __javax_management_AttributeChangeNotification__
+
+#pragma interface
+
+#include <javax/management/Notification.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace management
+    {
+        class AttributeChangeNotification;
+    }
+  }
+}
+
+class javax::management::AttributeChangeNotification : public ::javax::management::Notification
+{
+
+public:
+  AttributeChangeNotification(::java::lang::Object *, jlong, jlong, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *);
+  virtual ::java::lang::String * getAttributeName();
+  virtual ::java::lang::String * getAttributeType();
+  virtual ::java::lang::Object * getOldValue();
+  virtual ::java::lang::Object * getNewValue();
+private:
+  static const jlong serialVersionUID = 535176054565814134LL;
+public:
+  static ::java::lang::String * ATTRIBUTE_CHANGE;
+private:
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::management::Notification)))) attributeName;
+  ::java::lang::String * attributeType;
+  ::java::lang::Object * oldValue;
+  ::java::lang::Object * newValue;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_management_AttributeChangeNotification__
diff --git a/libjava/javax/management/AttributeChangeNotificationFilter.h b/libjava/javax/management/AttributeChangeNotificationFilter.h
new file mode 100644
index 00000000000..31c14e24e00
--- /dev/null
+++ b/libjava/javax/management/AttributeChangeNotificationFilter.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_management_AttributeChangeNotificationFilter__
+#define __javax_management_AttributeChangeNotificationFilter__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace management
+    {
+        class AttributeChangeNotificationFilter;
+        class Notification;
+    }
+  }
+}
+
+class javax::management::AttributeChangeNotificationFilter : public ::java::lang::Object
+{
+
+public:
+  AttributeChangeNotificationFilter();
+  virtual void disableAllAttributes();
+  virtual void disableAttribute(::java::lang::String *);
+  virtual void enableAttribute(::java::lang::String *);
+  virtual ::java::util::Vector * getEnabledAttributes();
+  virtual jboolean isNotificationEnabled(::javax::management::Notification *);
+private:
+  static const jlong serialVersionUID = -6347317584796410029LL;
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) enabledAttributes;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_management_AttributeChangeNotificationFilter__
diff --git a/libjava/javax/management/AttributeValueExp.h b/libjava/javax/management/AttributeValueExp.h
new file mode 100644
index 00000000000..02ad058adc1
--- /dev/null
+++ b/libjava/javax/management/AttributeValueExp.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_management_AttributeValueExp__
+#define __javax_management_AttributeValueExp__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace management
+    {
+        class AttributeValueExp;
+        class MBeanServer;
+        class ObjectName;
+        class ValueExp;
+    }
+  }
+}
+
+class javax::management::AttributeValueExp : public ::java::lang::Object
+{
+
+public:
+  AttributeValueExp();
+  AttributeValueExp(::java::lang::String *);
+  virtual ::javax::management::ValueExp * apply(::javax::management::ObjectName *);
+public: // actually protected
+  virtual ::java::lang::Object * getAttribute(::javax::management::ObjectName *);
+public:
+  virtual ::java::lang::String * getAttributeName();
+  virtual void setMBeanServer(::javax::management::MBeanServer *);
+  virtual ::java::lang::String * toString();
+private:
+  static const jlong serialVersionUID = -7768025046539163385LL;
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) attr;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_management_AttributeValueExp__
diff --git a/libjava/javax/management/DefaultLoaderRepository.h b/libjava/javax/management/DefaultLoaderRepository.h
new file mode 100644
index 00000000000..bdfc3fbaed1
--- /dev/null
+++ b/libjava/javax/management/DefaultLoaderRepository.h
@@ -0,0 +1,31 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_management_DefaultLoaderRepository__
+#define __javax_management_DefaultLoaderRepository__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace management
+    {
+        class DefaultLoaderRepository;
+    }
+  }
+}
+
+class javax::management::DefaultLoaderRepository : public ::java::lang::Object
+{
+
+public:
+  DefaultLoaderRepository();
+  static ::java::lang::Class * loadClass(::java::lang::String *);
+  static ::java::lang::Class * loadClassWithout(::java::lang::ClassLoader *, ::java::lang::String *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_management_DefaultLoaderRepository__
diff --git a/libjava/javax/management/Descriptor.h b/libjava/javax/management/Descriptor.h
new file mode 100644
index 00000000000..d8386304a60
--- /dev/null
+++ b/libjava/javax/management/Descriptor.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_management_Descriptor__
+#define __javax_management_Descriptor__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace management
+    {
+        class Descriptor;
+    }
+  }
+}
+
+class javax::management::Descriptor : public ::java::lang::Object
+{
+
+public:
+  virtual ::java::lang::Object * clone() = 0;
+  virtual jboolean equals(::java::lang::Object *) = 0;
+  virtual JArray< ::java::lang::String * > * getFieldNames() = 0;
+  virtual JArray< ::java::lang::String * > * getFields() = 0;
+  virtual ::java::lang::Object * getFieldValue(::java::lang::String *) = 0;
+  virtual JArray< ::java::lang::Object * > * getFieldValues(JArray< ::java::lang::String * > *) = 0;
+  virtual jint hashCode() = 0;
+  virtual jboolean isValid() = 0;
+  virtual void removeField(::java::lang::String *) = 0;
+  virtual void setField(::java::lang::String *, ::java::lang::Object *) = 0;
+  virtual void setFields(JArray< ::java::lang::String * > *, JArray< ::java::lang::Object * > *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_management_Descriptor__
diff --git a/libjava/javax/management/DescriptorAccess.h b/libjava/javax/management/DescriptorAccess.h
new file mode 100644
index 00000000000..9baf7a0a277
--- /dev/null
+++ b/libjava/javax/management/DescriptorAccess.h
@@ -0,0 +1,31 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_management_DescriptorAccess__
+#define __javax_management_DescriptorAccess__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace management
+    {
+        class Descriptor;
+        class DescriptorAccess;
+    }
+  }
+}
+
+class javax::management::DescriptorAccess : public ::java::lang::Object
+{
+
+public:
+  virtual void setDescriptor(::javax::management::Descriptor *) = 0;
+  virtual ::javax::management::Descriptor * getDescriptor() = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_management_DescriptorAccess__
diff --git a/libjava/javax/management/DescriptorRead.h b/libjava/javax/management/DescriptorRead.h
new file mode 100644
index 00000000000..7552b84855d
--- /dev/null
+++ b/libjava/javax/management/DescriptorRead.h
@@ -0,0 +1,30 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_management_DescriptorRead__
+#define __javax_management_DescriptorRead__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace management
+    {
+        class Descriptor;
+        class DescriptorRead;
+    }
+  }
+}
+
+class javax::management::DescriptorRead : public ::java::lang::Object
+{
+
+public:
+  virtual ::javax::management::Descriptor * getDescriptor() = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_management_DescriptorRead__
diff --git a/libjava/javax/management/JMX.h b/libjava/javax/management/JMX.h
new file mode 100644
index 00000000000..605aaae2ff9
--- /dev/null
+++ b/libjava/javax/management/JMX.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_management_JMX__
+#define __javax_management_JMX__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace management
+    {
+        class JMX;
+        class MBeanServerConnection;
+        class ObjectName;
+    }
+  }
+}
+
+class javax::management::JMX : public ::java::lang::Object
+{
+
+  JMX();
+public:
+  static jboolean isMXBeanInterface(::java::lang::Class *);
+  static ::java::lang::Object * newMBeanProxy(::javax::management::MBeanServerConnection *, ::javax::management::ObjectName *, ::java::lang::Class *);
+  static ::java::lang::Object * newMBeanProxy(::javax::management::MBeanServerConnection *, ::javax::management::ObjectName *, ::java::lang::Class *, jboolean);
+  static ::java::lang::Object * newMXBeanProxy(::javax::management::MBeanServerConnection *, ::javax::management::ObjectName *, ::java::lang::Class *);
+  static ::java::lang::Object * newMXBeanProxy(::javax::management::MBeanServerConnection *, ::javax::management::ObjectName *, ::java::lang::Class *, jboolean);
+  static ::java::lang::String * DEFAULT_VALUE_FIELD;
+  static ::java::lang::String * IMMUTABLE_INFO_FIELD;
+  static ::java::lang::String * INTERFACE_CLASS_NAME_FIELD;
+  static ::java::lang::String * LEGAL_VALUES_FIELD;
+  static ::java::lang::String * MAX_VALUE_FIELD;
+  static ::java::lang::String * MIN_VALUE_FIELD;
+  static ::java::lang::String * MXBEAN_FIELD;
+  static ::java::lang::String * OPEN_TYPE_FIELD;
+  static ::java::lang::String * ORIGINAL_TYPE_FIELD;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_management_JMX__
diff --git a/libjava/javax/management/MBeanAttributeInfo.h b/libjava/javax/management/MBeanAttributeInfo.h
index ab088c63578..0a9bb73f21c 100644
--- a/libjava/javax/management/MBeanAttributeInfo.h
+++ b/libjava/javax/management/MBeanAttributeInfo.h
@@ -33,6 +33,7 @@ public:
   virtual jboolean isWritable();
   virtual ::java::lang::String * toString();
 private:
+  static const jlong serialVersionUID = 8644704819898565848LL;
   ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::management::MBeanFeatureInfo)))) attributeType;
   jboolean isWrite;
   jboolean isRead;
diff --git a/libjava/javax/management/MBeanFeatureInfo.h b/libjava/javax/management/MBeanFeatureInfo.h
index 60006427c2a..7675ec6740f 100644
--- a/libjava/javax/management/MBeanFeatureInfo.h
+++ b/libjava/javax/management/MBeanFeatureInfo.h
@@ -29,6 +29,7 @@ public:
   virtual jint hashCode();
   virtual ::java::lang::String * toString();
 private:
+  void writeObject(::java::io::ObjectOutputStream *);
   static const jlong serialVersionUID = 3952882688968447265LL;
 public: // actually protected
   ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) description;
diff --git a/libjava/javax/management/MBeanServerInvocationHandler.h b/libjava/javax/management/MBeanServerInvocationHandler.h
new file mode 100644
index 00000000000..d2ac83120d7
--- /dev/null
+++ b/libjava/javax/management/MBeanServerInvocationHandler.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_management_MBeanServerInvocationHandler__
+#define __javax_management_MBeanServerInvocationHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace management
+    {
+        class MBeanServerConnection;
+        class MBeanServerInvocationHandler;
+        class ObjectName;
+    }
+  }
+}
+
+class javax::management::MBeanServerInvocationHandler : public ::java::lang::Object
+{
+
+public:
+  MBeanServerInvocationHandler(::javax::management::MBeanServerConnection *, ::javax::management::ObjectName *);
+  MBeanServerInvocationHandler(::javax::management::MBeanServerConnection *, ::javax::management::ObjectName *, jboolean);
+  virtual ::javax::management::MBeanServerConnection * getMBeanServerConnection();
+  virtual ::javax::management::ObjectName * getObjectName();
+  virtual ::java::lang::Object * invoke(::java::lang::Object *, ::java::lang::reflect::Method *, JArray< ::java::lang::Object * > *);
+  virtual jboolean isMXBean();
+  static ::java::lang::Object * newProxyInstance(::javax::management::MBeanServerConnection *, ::javax::management::ObjectName *, ::java::lang::Class *, jboolean);
+private:
+  jboolean inInterface(::java::lang::String *, ::java::lang::Class *, JArray< ::java::lang::Class * > *);
+  ::javax::management::MBeanServerConnection * __attribute__((aligned(__alignof__( ::java::lang::Object)))) conn;
+  ::javax::management::ObjectName * name;
+  jboolean mxBean;
+  ::java::lang::Class * iface;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_management_MBeanServerInvocationHandler__
diff --git a/libjava/javax/management/MXBean.h b/libjava/javax/management/MXBean.h
new file mode 100644
index 00000000000..58e72395927
--- /dev/null
+++ b/libjava/javax/management/MXBean.h
@@ -0,0 +1,30 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_management_MXBean__
+#define __javax_management_MXBean__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace management
+    {
+        class MXBean;
+    }
+  }
+}
+
+class javax::management::MXBean : public ::java::lang::Object
+{
+
+public:
+  virtual jboolean value() = 0;
+  virtual ::java::lang::Class * annotationType() = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_management_MXBean__
diff --git a/libjava/javax/management/Notification.h b/libjava/javax/management/Notification.h
index f53a4d5d604..c0d096d0773 100644
--- a/libjava/javax/management/Notification.h
+++ b/libjava/javax/management/Notification.h
@@ -37,6 +37,8 @@ public:
   virtual void setUserData(::java::lang::Object *);
   virtual ::java::lang::String * toString();
 private:
+  void writeObject(::java::io::ObjectOutputStream *);
+  static const jlong serialVersionUID = -7516092053498031989LL;
   ::java::lang::String * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) message;
   jlong sequenceNumber;
 public: // actually protected
diff --git a/libjava/javax/management/NotificationBroadcasterSupport$DispatchTask.h b/libjava/javax/management/NotificationBroadcasterSupport$DispatchTask.h
new file mode 100644
index 00000000000..af6dbaccba1
--- /dev/null
+++ b/libjava/javax/management/NotificationBroadcasterSupport$DispatchTask.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_management_NotificationBroadcasterSupport$DispatchTask__
+#define __javax_management_NotificationBroadcasterSupport$DispatchTask__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace management
+      {
+          class ListenerData;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace management
+    {
+        class Notification;
+        class NotificationBroadcasterSupport;
+        class NotificationBroadcasterSupport$DispatchTask;
+    }
+  }
+}
+
+class javax::management::NotificationBroadcasterSupport$DispatchTask : public ::java::lang::Object
+{
+
+public:
+  NotificationBroadcasterSupport$DispatchTask(::javax::management::NotificationBroadcasterSupport *, ::gnu::javax::management::ListenerData *, ::javax::management::Notification *);
+  void run();
+private:
+  ::gnu::javax::management::ListenerData * __attribute__((aligned(__alignof__( ::java::lang::Object)))) ldata;
+  ::javax::management::Notification * notif;
+public: // actually package-private
+  ::javax::management::NotificationBroadcasterSupport * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_management_NotificationBroadcasterSupport$DispatchTask__
diff --git a/libjava/javax/management/NotificationBroadcasterSupport.h b/libjava/javax/management/NotificationBroadcasterSupport.h
new file mode 100644
index 00000000000..cea1aa3be0b
--- /dev/null
+++ b/libjava/javax/management/NotificationBroadcasterSupport.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_management_NotificationBroadcasterSupport__
+#define __javax_management_NotificationBroadcasterSupport__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace management
+    {
+        class MBeanNotificationInfo;
+        class Notification;
+        class NotificationBroadcasterSupport;
+        class NotificationFilter;
+        class NotificationListener;
+    }
+  }
+}
+
+class javax::management::NotificationBroadcasterSupport : public ::java::lang::Object
+{
+
+public:
+  NotificationBroadcasterSupport();
+  NotificationBroadcasterSupport(::java::util::concurrent::Executor *);
+  NotificationBroadcasterSupport(JArray< ::javax::management::MBeanNotificationInfo * > *);
+  NotificationBroadcasterSupport(::java::util::concurrent::Executor *, JArray< ::javax::management::MBeanNotificationInfo * > *);
+  virtual void addNotificationListener(::javax::management::NotificationListener *, ::javax::management::NotificationFilter *, ::java::lang::Object *);
+  virtual JArray< ::javax::management::MBeanNotificationInfo * > * getNotificationInfo();
+public: // actually protected
+  virtual void handleNotification(::javax::management::NotificationListener *, ::javax::management::Notification *, ::java::lang::Object *);
+public:
+  virtual void removeNotificationListener(::javax::management::NotificationListener *);
+  virtual void removeNotificationListener(::javax::management::NotificationListener *, ::javax::management::NotificationFilter *, ::java::lang::Object *);
+  virtual void sendNotification(::javax::management::Notification *);
+private:
+  ::java::util::concurrent::Executor * __attribute__((aligned(__alignof__( ::java::lang::Object)))) executor;
+  JArray< ::javax::management::MBeanNotificationInfo * > * info;
+  ::java::util::List * listeners;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_management_NotificationBroadcasterSupport__
diff --git a/libjava/javax/management/NotificationFilterSupport.h b/libjava/javax/management/NotificationFilterSupport.h
new file mode 100644
index 00000000000..f1ae48a6807
--- /dev/null
+++ b/libjava/javax/management/NotificationFilterSupport.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_management_NotificationFilterSupport__
+#define __javax_management_NotificationFilterSupport__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace management
+    {
+        class Notification;
+        class NotificationFilterSupport;
+    }
+  }
+}
+
+class javax::management::NotificationFilterSupport : public ::java::lang::Object
+{
+
+public:
+  NotificationFilterSupport();
+  virtual void disableAllTypes();
+  virtual void disableType(::java::lang::String *);
+  virtual void enableType(::java::lang::String *);
+  virtual ::java::util::Vector * getEnabledTypes();
+  virtual jboolean isNotificationEnabled(::javax::management::Notification *);
+private:
+  static const jlong serialVersionUID = 6579080007561786969LL;
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) enabledTypes;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_management_NotificationFilterSupport__
diff --git a/libjava/javax/management/PersistentMBean.h b/libjava/javax/management/PersistentMBean.h
new file mode 100644
index 00000000000..e11651bf986
--- /dev/null
+++ b/libjava/javax/management/PersistentMBean.h
@@ -0,0 +1,30 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_management_PersistentMBean__
+#define __javax_management_PersistentMBean__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace management
+    {
+        class PersistentMBean;
+    }
+  }
+}
+
+class javax::management::PersistentMBean : public ::java::lang::Object
+{
+
+public:
+  virtual void load() = 0;
+  virtual void store() = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_management_PersistentMBean__
diff --git a/libjava/javax/management/Query$AndQueryExp.h b/libjava/javax/management/Query$AndQueryExp.h
new file mode 100644
index 00000000000..425690e694a
--- /dev/null
+++ b/libjava/javax/management/Query$AndQueryExp.h
@@ -0,0 +1,37 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_management_Query$AndQueryExp__
+#define __javax_management_Query$AndQueryExp__
+
+#pragma interface
+
+#include <javax/management/QueryEval.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace management
+    {
+        class ObjectName;
+        class Query$AndQueryExp;
+        class QueryExp;
+    }
+  }
+}
+
+class javax::management::Query$AndQueryExp : public ::javax::management::QueryEval
+{
+
+public:
+  Query$AndQueryExp(::javax::management::QueryExp *, ::javax::management::QueryExp *);
+  jboolean apply(::javax::management::ObjectName *);
+private:
+  static const jlong serialVersionUID = -1081892073854801359LL;
+  ::javax::management::QueryExp * __attribute__((aligned(__alignof__( ::javax::management::QueryEval)))) exp1;
+  ::javax::management::QueryExp * exp2;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_management_Query$AndQueryExp__
diff --git a/libjava/javax/management/Query$BetweenQueryExp.h b/libjava/javax/management/Query$BetweenQueryExp.h
new file mode 100644
index 00000000000..143a3b44e45
--- /dev/null
+++ b/libjava/javax/management/Query$BetweenQueryExp.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_management_Query$BetweenQueryExp__
+#define __javax_management_Query$BetweenQueryExp__
+
+#pragma interface
+
+#include <javax/management/QueryEval.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace management
+    {
+        class ObjectName;
+        class Query$BetweenQueryExp;
+        class ValueExp;
+    }
+  }
+}
+
+class javax::management::Query$BetweenQueryExp : public ::javax::management::QueryEval
+{
+
+public:
+  Query$BetweenQueryExp(::javax::management::ValueExp *, ::javax::management::ValueExp *, ::javax::management::ValueExp *);
+  jboolean apply(::javax::management::ObjectName *);
+private:
+  static const jlong serialVersionUID = -2933597532866307444LL;
+  ::javax::management::ValueExp * __attribute__((aligned(__alignof__( ::javax::management::QueryEval)))) exp1;
+  ::javax::management::ValueExp * exp2;
+  ::javax::management::ValueExp * exp3;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_management_Query$BetweenQueryExp__
diff --git a/libjava/javax/management/Query$BinaryOpValueExp.h b/libjava/javax/management/Query$BinaryOpValueExp.h
new file mode 100644
index 00000000000..7462caf112f
--- /dev/null
+++ b/libjava/javax/management/Query$BinaryOpValueExp.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_management_Query$BinaryOpValueExp__
+#define __javax_management_Query$BinaryOpValueExp__
+
+#pragma interface
+
+#include <javax/management/QueryEval.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace management
+    {
+        class ObjectName;
+        class Query$BinaryOpValueExp;
+        class ValueExp;
+    }
+  }
+}
+
+class javax::management::Query$BinaryOpValueExp : public ::javax::management::QueryEval
+{
+
+public:
+  Query$BinaryOpValueExp(jint, ::javax::management::ValueExp *, ::javax::management::ValueExp *);
+  ::javax::management::ValueExp * apply(::javax::management::ObjectName *);
+  ::java::lang::String * toString();
+private:
+  static const jlong serialVersionUID = 1216286847881456786LL;
+  jint __attribute__((aligned(__alignof__( ::javax::management::QueryEval)))) op;
+  ::javax::management::ValueExp * exp1;
+  ::javax::management::ValueExp * exp2;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_management_Query$BinaryOpValueExp__
diff --git a/libjava/javax/management/Query$BinaryRelQueryExp.h b/libjava/javax/management/Query$BinaryRelQueryExp.h
new file mode 100644
index 00000000000..4d59923250a
--- /dev/null
+++ b/libjava/javax/management/Query$BinaryRelQueryExp.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_management_Query$BinaryRelQueryExp__
+#define __javax_management_Query$BinaryRelQueryExp__
+
+#pragma interface
+
+#include <javax/management/QueryEval.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace management
+    {
+        class ObjectName;
+        class Query$BinaryRelQueryExp;
+        class ValueExp;
+    }
+  }
+}
+
+class javax::management::Query$BinaryRelQueryExp : public ::javax::management::QueryEval
+{
+
+public:
+  Query$BinaryRelQueryExp(jint, ::javax::management::ValueExp *, ::javax::management::ValueExp *);
+  jboolean apply(::javax::management::ObjectName *);
+  ::java::lang::String * toString();
+private:
+  static const jlong serialVersionUID = -5690656271650491000LL;
+  jint __attribute__((aligned(__alignof__( ::javax::management::QueryEval)))) relOp;
+  ::javax::management::ValueExp * exp1;
+  ::javax::management::ValueExp * exp2;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_management_Query$BinaryRelQueryExp__
diff --git a/libjava/javax/management/Query$BooleanValueExp.h b/libjava/javax/management/Query$BooleanValueExp.h
new file mode 100644
index 00000000000..d8e175f2a40
--- /dev/null
+++ b/libjava/javax/management/Query$BooleanValueExp.h
@@ -0,0 +1,37 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_management_Query$BooleanValueExp__
+#define __javax_management_Query$BooleanValueExp__
+
+#pragma interface
+
+#include <javax/management/QueryEval.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace management
+    {
+        class ObjectName;
+        class Query$BooleanValueExp;
+        class ValueExp;
+    }
+  }
+}
+
+class javax::management::Query$BooleanValueExp : public ::javax::management::QueryEval
+{
+
+public:
+  Query$BooleanValueExp(jboolean);
+  ::javax::management::ValueExp * apply(::javax::management::ObjectName *);
+  ::java::lang::String * toString();
+private:
+  static const jlong serialVersionUID = 7754922052666594581LL;
+  jboolean __attribute__((aligned(__alignof__( ::javax::management::QueryEval)))) val;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_management_Query$BooleanValueExp__
diff --git a/libjava/javax/management/Query$ClassAttributeValueExp.h b/libjava/javax/management/Query$ClassAttributeValueExp.h
new file mode 100644
index 00000000000..d967ccf83e6
--- /dev/null
+++ b/libjava/javax/management/Query$ClassAttributeValueExp.h
@@ -0,0 +1,37 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_management_Query$ClassAttributeValueExp__
+#define __javax_management_Query$ClassAttributeValueExp__
+
+#pragma interface
+
+#include <javax/management/AttributeValueExp.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace management
+    {
+        class ObjectName;
+        class Query$ClassAttributeValueExp;
+        class ValueExp;
+    }
+  }
+}
+
+class javax::management::Query$ClassAttributeValueExp : public ::javax::management::AttributeValueExp
+{
+
+  Query$ClassAttributeValueExp();
+public:
+  ::javax::management::ValueExp * apply(::javax::management::ObjectName *);
+public: // actually package-private
+  Query$ClassAttributeValueExp(::javax::management::Query$ClassAttributeValueExp *);
+private:
+  static const jlong serialVersionUID = -1081892073854801359LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_management_Query$ClassAttributeValueExp__
diff --git a/libjava/javax/management/Query$InQueryExp.h b/libjava/javax/management/Query$InQueryExp.h
new file mode 100644
index 00000000000..5bdb3b8a927
--- /dev/null
+++ b/libjava/javax/management/Query$InQueryExp.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_management_Query$InQueryExp__
+#define __javax_management_Query$InQueryExp__
+
+#pragma interface
+
+#include <javax/management/QueryEval.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace management
+    {
+        class ObjectName;
+        class Query$InQueryExp;
+        class ValueExp;
+    }
+  }
+}
+
+class javax::management::Query$InQueryExp : public ::javax::management::QueryEval
+{
+
+public:
+  Query$InQueryExp(::javax::management::ValueExp *, JArray< ::javax::management::ValueExp * > *);
+  jboolean apply(::javax::management::ObjectName *);
+private:
+  static const jlong serialVersionUID = -5801329450358952434LL;
+  ::javax::management::ValueExp * __attribute__((aligned(__alignof__( ::javax::management::QueryEval)))) val;
+  JArray< ::javax::management::ValueExp * > * valueList;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_management_Query$InQueryExp__
diff --git a/libjava/javax/management/Query$InstanceOfQueryExp.h b/libjava/javax/management/Query$InstanceOfQueryExp.h
new file mode 100644
index 00000000000..3d2828c540c
--- /dev/null
+++ b/libjava/javax/management/Query$InstanceOfQueryExp.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_management_Query$InstanceOfQueryExp__
+#define __javax_management_Query$InstanceOfQueryExp__
+
+#pragma interface
+
+#include <javax/management/QueryEval.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace management
+    {
+        class ObjectName;
+        class Query$InstanceOfQueryExp;
+        class StringValueExp;
+    }
+  }
+}
+
+class javax::management::Query$InstanceOfQueryExp : public ::javax::management::QueryEval
+{
+
+public:
+  Query$InstanceOfQueryExp(::javax::management::StringValueExp *);
+  jboolean apply(::javax::management::ObjectName *);
+private:
+  static const jlong serialVersionUID = -1081892073854801359LL;
+  ::javax::management::StringValueExp * __attribute__((aligned(__alignof__( ::javax::management::QueryEval)))) classNameValue;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_management_Query$InstanceOfQueryExp__
diff --git a/libjava/javax/management/Query$MatchQueryExp.h b/libjava/javax/management/Query$MatchQueryExp.h
new file mode 100644
index 00000000000..77da4ea6d78
--- /dev/null
+++ b/libjava/javax/management/Query$MatchQueryExp.h
@@ -0,0 +1,37 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_management_Query$MatchQueryExp__
+#define __javax_management_Query$MatchQueryExp__
+
+#pragma interface
+
+#include <javax/management/QueryEval.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace management
+    {
+        class AttributeValueExp;
+        class ObjectName;
+        class Query$MatchQueryExp;
+    }
+  }
+}
+
+class javax::management::Query$MatchQueryExp : public ::javax::management::QueryEval
+{
+
+public:
+  Query$MatchQueryExp(::javax::management::AttributeValueExp *, ::java::lang::String *);
+  jboolean apply(::javax::management::ObjectName *);
+private:
+  static const jlong serialVersionUID = -7156603696948215014LL;
+  ::javax::management::AttributeValueExp * __attribute__((aligned(__alignof__( ::javax::management::QueryEval)))) exp;
+  ::java::lang::String * pattern;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_management_Query$MatchQueryExp__
diff --git a/libjava/javax/management/Query$NotQueryExp.h b/libjava/javax/management/Query$NotQueryExp.h
new file mode 100644
index 00000000000..b5d5a166752
--- /dev/null
+++ b/libjava/javax/management/Query$NotQueryExp.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_management_Query$NotQueryExp__
+#define __javax_management_Query$NotQueryExp__
+
+#pragma interface
+
+#include <javax/management/QueryEval.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace management
+    {
+        class ObjectName;
+        class Query$NotQueryExp;
+        class QueryExp;
+    }
+  }
+}
+
+class javax::management::Query$NotQueryExp : public ::javax::management::QueryEval
+{
+
+public:
+  Query$NotQueryExp(::javax::management::QueryExp *);
+  jboolean apply(::javax::management::ObjectName *);
+private:
+  static const jlong serialVersionUID = 5269643775896723397LL;
+  ::javax::management::QueryExp * __attribute__((aligned(__alignof__( ::javax::management::QueryEval)))) exp;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_management_Query$NotQueryExp__
diff --git a/libjava/javax/management/Query$NumericValueExp.h b/libjava/javax/management/Query$NumericValueExp.h
new file mode 100644
index 00000000000..8e545670cfc
--- /dev/null
+++ b/libjava/javax/management/Query$NumericValueExp.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_management_Query$NumericValueExp__
+#define __javax_management_Query$NumericValueExp__
+
+#pragma interface
+
+#include <javax/management/QueryEval.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace management
+    {
+        class ObjectName;
+        class Query$NumericValueExp;
+        class ValueExp;
+    }
+  }
+}
+
+class javax::management::Query$NumericValueExp : public ::javax::management::QueryEval
+{
+
+public:
+  Query$NumericValueExp(::java::lang::Number *);
+  ::javax::management::ValueExp * apply(::javax::management::ObjectName *);
+  ::java::lang::Number * getValue();
+  ::java::lang::String * toString();
+  ::javax::management::Query$NumericValueExp * plus(::javax::management::Query$NumericValueExp *);
+  ::javax::management::Query$NumericValueExp * minus(::javax::management::Query$NumericValueExp *);
+  ::javax::management::Query$NumericValueExp * times(::javax::management::Query$NumericValueExp *);
+  ::javax::management::Query$NumericValueExp * div(::javax::management::Query$NumericValueExp *);
+private:
+  static const jlong serialVersionUID = -4679739485102359104LL;
+  ::java::lang::Number * __attribute__((aligned(__alignof__( ::javax::management::QueryEval)))) val;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_management_Query$NumericValueExp__
diff --git a/libjava/javax/management/Query$OrQueryExp.h b/libjava/javax/management/Query$OrQueryExp.h
new file mode 100644
index 00000000000..cde1c65dcbf
--- /dev/null
+++ b/libjava/javax/management/Query$OrQueryExp.h
@@ -0,0 +1,37 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_management_Query$OrQueryExp__
+#define __javax_management_Query$OrQueryExp__
+
+#pragma interface
+
+#include <javax/management/QueryEval.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace management
+    {
+        class ObjectName;
+        class Query$OrQueryExp;
+        class QueryExp;
+    }
+  }
+}
+
+class javax::management::Query$OrQueryExp : public ::javax::management::QueryEval
+{
+
+public:
+  Query$OrQueryExp(::javax::management::QueryExp *, ::javax::management::QueryExp *);
+  jboolean apply(::javax::management::ObjectName *);
+private:
+  static const jlong serialVersionUID = 2962973084421716523LL;
+  ::javax::management::QueryExp * __attribute__((aligned(__alignof__( ::javax::management::QueryEval)))) exp1;
+  ::javax::management::QueryExp * exp2;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_management_Query$OrQueryExp__
diff --git a/libjava/javax/management/Query$QualifiedAttributeValueExp.h b/libjava/javax/management/Query$QualifiedAttributeValueExp.h
new file mode 100644
index 00000000000..01045b6a68b
--- /dev/null
+++ b/libjava/javax/management/Query$QualifiedAttributeValueExp.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_management_Query$QualifiedAttributeValueExp__
+#define __javax_management_Query$QualifiedAttributeValueExp__
+
+#pragma interface
+
+#include <javax/management/AttributeValueExp.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace management
+    {
+        class ObjectName;
+        class Query$QualifiedAttributeValueExp;
+        class ValueExp;
+    }
+  }
+}
+
+class javax::management::Query$QualifiedAttributeValueExp : public ::javax::management::AttributeValueExp
+{
+
+public:
+  Query$QualifiedAttributeValueExp(::java::lang::String *, ::java::lang::String *);
+  ::javax::management::ValueExp * apply(::javax::management::ObjectName *);
+private:
+  static const jlong serialVersionUID = 8832517277410933254LL;
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::management::AttributeValueExp)))) className;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_management_Query$QualifiedAttributeValueExp__
diff --git a/libjava/javax/management/Query.h b/libjava/javax/management/Query.h
new file mode 100644
index 00000000000..34e28e754f9
--- /dev/null
+++ b/libjava/javax/management/Query.h
@@ -0,0 +1,73 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_management_Query__
+#define __javax_management_Query__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace management
+    {
+        class AttributeValueExp;
+        class Query;
+        class QueryExp;
+        class StringValueExp;
+        class ValueExp;
+    }
+  }
+}
+
+class javax::management::Query : public ::java::lang::Object
+{
+
+public:
+  Query();
+  static ::javax::management::QueryExp * and$(::javax::management::QueryExp *, ::javax::management::QueryExp *);
+  static ::javax::management::QueryExp * anySubString(::javax::management::AttributeValueExp *, ::javax::management::StringValueExp *);
+  static ::javax::management::AttributeValueExp * attr(::java::lang::String *);
+  static ::javax::management::AttributeValueExp * attr(::java::lang::String *, ::java::lang::String *);
+  static ::javax::management::QueryExp * between(::javax::management::ValueExp *, ::javax::management::ValueExp *, ::javax::management::ValueExp *);
+  static ::javax::management::AttributeValueExp * classattr();
+  static ::javax::management::ValueExp * div(::javax::management::ValueExp *, ::javax::management::ValueExp *);
+  static ::javax::management::QueryExp * eq(::javax::management::ValueExp *, ::javax::management::ValueExp *);
+  static ::javax::management::QueryExp * finalSubString(::javax::management::AttributeValueExp *, ::javax::management::StringValueExp *);
+  static ::javax::management::QueryExp * geq(::javax::management::ValueExp *, ::javax::management::ValueExp *);
+  static ::javax::management::QueryExp * gt(::javax::management::ValueExp *, ::javax::management::ValueExp *);
+  static ::javax::management::QueryExp * in(::javax::management::ValueExp *, JArray< ::javax::management::ValueExp * > *);
+  static ::javax::management::QueryExp * initialSubString(::javax::management::AttributeValueExp *, ::javax::management::StringValueExp *);
+  static ::javax::management::QueryExp * isInstanceOf(::javax::management::StringValueExp *);
+  static ::javax::management::QueryExp * leq(::javax::management::ValueExp *, ::javax::management::ValueExp *);
+  static ::javax::management::QueryExp * lt(::javax::management::ValueExp *, ::javax::management::ValueExp *);
+  static ::javax::management::QueryExp * match(::javax::management::AttributeValueExp *, ::javax::management::StringValueExp *);
+  static ::javax::management::ValueExp * minus(::javax::management::ValueExp *, ::javax::management::ValueExp *);
+  static ::javax::management::QueryExp * not$(::javax::management::QueryExp *);
+  static ::javax::management::QueryExp * or$(::javax::management::QueryExp *, ::javax::management::QueryExp *);
+  static ::javax::management::ValueExp * plus(::javax::management::ValueExp *, ::javax::management::ValueExp *);
+  static ::javax::management::ValueExp * times(::javax::management::ValueExp *, ::javax::management::ValueExp *);
+  static ::javax::management::ValueExp * value(jboolean);
+  static ::javax::management::ValueExp * value(jdouble);
+  static ::javax::management::ValueExp * value(jfloat);
+  static ::javax::management::ValueExp * value(jint);
+  static ::javax::management::ValueExp * value(jlong);
+  static ::javax::management::ValueExp * value(::java::lang::Number *);
+  static ::javax::management::StringValueExp * value(::java::lang::String *);
+  static const jint PLUS = 0;
+  static const jint MINUS = 1;
+  static const jint TIMES = 2;
+  static const jint DIV = 3;
+  static const jint GT = 0;
+  static const jint LT = 1;
+  static const jint GE = 2;
+  static const jint LE = 3;
+  static const jint EQ = 4;
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_management_Query__
diff --git a/libjava/javax/management/QueryEval.h b/libjava/javax/management/QueryEval.h
new file mode 100644
index 00000000000..adba7bb9845
--- /dev/null
+++ b/libjava/javax/management/QueryEval.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_management_QueryEval__
+#define __javax_management_QueryEval__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace management
+    {
+        class MBeanServer;
+        class QueryEval;
+    }
+  }
+}
+
+class javax::management::QueryEval : public ::java::lang::Object
+{
+
+public:
+  QueryEval();
+  static ::javax::management::MBeanServer * getMBeanServer();
+  virtual void setMBeanServer(::javax::management::MBeanServer *);
+private:
+  static const jlong serialVersionUID = 2675899265640874796LL;
+  static ::java::lang::InheritableThreadLocal * server;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_management_QueryEval__
diff --git a/libjava/javax/management/StandardMBean.h b/libjava/javax/management/StandardMBean.h
index d4dabb19db7..805046ada6c 100644
--- a/libjava/javax/management/StandardMBean.h
+++ b/libjava/javax/management/StandardMBean.h
@@ -66,6 +66,7 @@ public:
   virtual ::javax::management::AttributeList * setAttributes(::javax::management::AttributeList *);
   virtual void setImplementation(::java::lang::Object *);
 private:
+  ::java::lang::reflect::Method * getMutator(::java::lang::String *, ::java::lang::Class *);
   ::java::lang::Class * __attribute__((aligned(__alignof__( ::java::lang::Object)))) iface;
   ::java::lang::Object * impl;
   ::javax::management::MBeanInfo * info;
diff --git a/libjava/javax/management/StringValueExp.h b/libjava/javax/management/StringValueExp.h
new file mode 100644
index 00000000000..b8cded4e5c1
--- /dev/null
+++ b/libjava/javax/management/StringValueExp.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_management_StringValueExp__
+#define __javax_management_StringValueExp__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace management
+    {
+        class MBeanServer;
+        class ObjectName;
+        class StringValueExp;
+        class ValueExp;
+    }
+  }
+}
+
+class javax::management::StringValueExp : public ::java::lang::Object
+{
+
+public:
+  StringValueExp();
+  StringValueExp(::java::lang::String *);
+  virtual ::javax::management::ValueExp * apply(::javax::management::ObjectName *);
+  virtual ::java::lang::String * getValue();
+  virtual void setMBeanServer(::javax::management::MBeanServer *);
+  virtual ::java::lang::String * toString();
+private:
+  static const jlong serialVersionUID = -3256390509806284044LL;
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) val;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_management_StringValueExp__
diff --git a/libjava/javax/management/openmbean/ArrayType.h b/libjava/javax/management/openmbean/ArrayType.h
index ba8dece65a7..e559cf22a9c 100644
--- a/libjava/javax/management/openmbean/ArrayType.h
+++ b/libjava/javax/management/openmbean/ArrayType.h
@@ -17,6 +17,7 @@ extern "Java"
       {
           class ArrayType;
           class OpenType;
+          class SimpleType;
       }
     }
   }
@@ -25,21 +26,33 @@ extern "Java"
 class javax::management::openmbean::ArrayType : public ::javax::management::openmbean::OpenType
 {
 
-  static ::java::lang::String * getArrayClassName(::java::lang::String *, jint);
+  static ::java::lang::String * getArrayClassName(::javax::management::openmbean::OpenType *, jint, jboolean);
+  static jint getDimensions(::javax::management::openmbean::OpenType *, jint);
+  static ::javax::management::openmbean::SimpleType * getPrimitiveType(::java::lang::Class *);
+  static ::java::lang::Class * getPrimitiveTypeClass(::javax::management::openmbean::SimpleType *);
+  static ::javax::management::openmbean::OpenType * getElementType(::javax::management::openmbean::OpenType *);
+  static ::java::lang::String * getElementTypeName(::javax::management::openmbean::OpenType *);
 public:
   ArrayType(jint, ::javax::management::openmbean::OpenType *);
+  ArrayType(::javax::management::openmbean::SimpleType *, jboolean);
   virtual jboolean equals(::java::lang::Object *);
+  static ::javax::management::openmbean::ArrayType * getArrayType(::javax::management::openmbean::OpenType *);
+  static ::javax::management::openmbean::ArrayType * getPrimitiveArrayType(::java::lang::Class *);
   virtual jint getDimension();
   virtual ::javax::management::openmbean::OpenType * getElementOpenType();
   virtual jint hashCode();
+  virtual jboolean isPrimitiveArray();
   virtual jboolean isValue(::java::lang::Object *);
   virtual ::java::lang::String * toString();
 private:
   static const jlong serialVersionUID = 720504429830309770LL;
   jint __attribute__((aligned(__alignof__( ::javax::management::openmbean::OpenType)))) dimension;
   ::javax::management::openmbean::OpenType * elementType;
+  jboolean primitiveArray;
   ::java::lang::Integer * hashCode__;
   ::java::lang::String * string;
+  static ::java::util::Map * cache;
+  static ::java::util::Map * primCache;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/javax/management/openmbean/CompositeDataInvocationHandler.h b/libjava/javax/management/openmbean/CompositeDataInvocationHandler.h
new file mode 100644
index 00000000000..e10d3645f26
--- /dev/null
+++ b/libjava/javax/management/openmbean/CompositeDataInvocationHandler.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_management_openmbean_CompositeDataInvocationHandler__
+#define __javax_management_openmbean_CompositeDataInvocationHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace management
+    {
+      namespace openmbean
+      {
+          class CompositeData;
+          class CompositeDataInvocationHandler;
+      }
+    }
+  }
+}
+
+class javax::management::openmbean::CompositeDataInvocationHandler : public ::java::lang::Object
+{
+
+public:
+  CompositeDataInvocationHandler(::javax::management::openmbean::CompositeData *);
+  virtual ::javax::management::openmbean::CompositeData * getCompositeData();
+  virtual ::java::lang::Object * invoke(::java::lang::Object *, ::java::lang::reflect::Method *, JArray< ::java::lang::Object * > *);
+private:
+  ::javax::management::openmbean::CompositeData * __attribute__((aligned(__alignof__( ::java::lang::Object)))) data;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_management_openmbean_CompositeDataInvocationHandler__
diff --git a/libjava/javax/management/openmbean/OpenType.h b/libjava/javax/management/openmbean/OpenType.h
index 4150cf14f50..b442b64ba11 100644
--- a/libjava/javax/management/openmbean/OpenType.h
+++ b/libjava/javax/management/openmbean/OpenType.h
@@ -44,6 +44,7 @@ private:
   ::java::lang::String * description;
 public:
   static JArray< ::java::lang::String * > * ALLOWED_CLASSNAMES;
+  static ::java::util::List * ALLOWED_CLASSNAMES_LIST;
   static ::java::lang::Class class$;
 };
 
diff --git a/libjava/javax/naming/directory/BasicAttributes$1.h b/libjava/javax/naming/directory/BasicAttributes$1.h
new file mode 100644
index 00000000000..d75a96e72d9
--- /dev/null
+++ b/libjava/javax/naming/directory/BasicAttributes$1.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_naming_directory_BasicAttributes$1__
+#define __javax_naming_directory_BasicAttributes$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace naming
+    {
+        class NamingEnumeration;
+      namespace directory
+      {
+          class BasicAttributes;
+          class BasicAttributes$1;
+      }
+    }
+  }
+}
+
+class javax::naming::directory::BasicAttributes$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  BasicAttributes$1(::javax::naming::directory::BasicAttributes *, ::javax::naming::NamingEnumeration *);
+public:
+  jboolean hasMore();
+  jboolean hasMoreElements();
+  ::java::lang::String * BasicAttributes$1$next();
+  ::java::lang::String * BasicAttributes$1$nextElement();
+  void close();
+  ::java::lang::Object * next();
+  ::java::lang::Object * nextElement();
+public: // actually package-private
+  ::javax::naming::directory::BasicAttributes * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+private:
+  ::javax::naming::NamingEnumeration * val$attrs;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_naming_directory_BasicAttributes$1__
diff --git a/libjava/javax/naming/directory/BasicAttributes$BasicAttributesEnumeration.h b/libjava/javax/naming/directory/BasicAttributes$BasicAttributesEnumeration.h
index 598b2276741..4b787eb0d2a 100644
--- a/libjava/javax/naming/directory/BasicAttributes$BasicAttributesEnumeration.h
+++ b/libjava/javax/naming/directory/BasicAttributes$BasicAttributesEnumeration.h
@@ -15,6 +15,7 @@ extern "Java"
     {
       namespace directory
       {
+          class Attribute;
           class BasicAttributes;
           class BasicAttributes$BasicAttributesEnumeration;
       }
@@ -26,15 +27,16 @@ class javax::naming::directory::BasicAttributes$BasicAttributesEnumeration : pub
 {
 
 public:
-  BasicAttributes$BasicAttributesEnumeration(::javax::naming::directory::BasicAttributes *, jboolean);
+  BasicAttributes$BasicAttributesEnumeration(::javax::naming::directory::BasicAttributes *);
   virtual void close();
   virtual jboolean hasMore();
-  virtual ::java::lang::Object * next();
+  virtual ::javax::naming::directory::Attribute * BasicAttributes$BasicAttributesEnumeration$next();
   virtual jboolean hasMoreElements();
+  virtual ::javax::naming::directory::Attribute * BasicAttributes$BasicAttributesEnumeration$nextElement();
+  virtual ::java::lang::Object * next();
   virtual ::java::lang::Object * nextElement();
 public: // actually package-private
   jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) where;
-  jboolean id;
   ::javax::naming::directory::BasicAttributes * this$0;
 public:
   static ::java::lang::Class class$;
diff --git a/libjava/javax/net/ssl/SSLServerSocketFactory$ErrorServerSocketFactory.h b/libjava/javax/net/ssl/SSLServerSocketFactory$ErrorServerSocketFactory.h
new file mode 100644
index 00000000000..a21a8dd7463
--- /dev/null
+++ b/libjava/javax/net/ssl/SSLServerSocketFactory$ErrorServerSocketFactory.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_net_ssl_SSLServerSocketFactory$ErrorServerSocketFactory__
+#define __javax_net_ssl_SSLServerSocketFactory$ErrorServerSocketFactory__
+
+#pragma interface
+
+#include <javax/net/ssl/SSLServerSocketFactory.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace net
+    {
+        class InetAddress;
+        class ServerSocket;
+    }
+  }
+  namespace javax
+  {
+    namespace net
+    {
+      namespace ssl
+      {
+          class SSLServerSocketFactory$ErrorServerSocketFactory;
+      }
+    }
+  }
+}
+
+class javax::net::ssl::SSLServerSocketFactory$ErrorServerSocketFactory : public ::javax::net::ssl::SSLServerSocketFactory
+{
+
+public: // actually package-private
+  SSLServerSocketFactory$ErrorServerSocketFactory(::java::lang::RuntimeException *);
+public:
+  ::java::net::ServerSocket * createServerSocket();
+  ::java::net::ServerSocket * createServerSocket(jint);
+  ::java::net::ServerSocket * createServerSocket(jint, jint);
+  ::java::net::ServerSocket * createServerSocket(jint, jint, ::java::net::InetAddress *);
+  JArray< ::java::lang::String * > * getDefaultCipherSuites();
+  JArray< ::java::lang::String * > * getSupportedCipherSuites();
+private:
+  ::java::lang::RuntimeException * __attribute__((aligned(__alignof__( ::javax::net::ssl::SSLServerSocketFactory)))) x;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_net_ssl_SSLServerSocketFactory$ErrorServerSocketFactory__
diff --git a/libjava/javax/net/ssl/SSLSocketFactory$ErrorSocketFactory.h b/libjava/javax/net/ssl/SSLSocketFactory$ErrorSocketFactory.h
new file mode 100644
index 00000000000..df6eab75d7e
--- /dev/null
+++ b/libjava/javax/net/ssl/SSLSocketFactory$ErrorSocketFactory.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_net_ssl_SSLSocketFactory$ErrorSocketFactory__
+#define __javax_net_ssl_SSLSocketFactory$ErrorSocketFactory__
+
+#pragma interface
+
+#include <javax/net/ssl/SSLSocketFactory.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace net
+    {
+        class InetAddress;
+        class Socket;
+    }
+  }
+  namespace javax
+  {
+    namespace net
+    {
+      namespace ssl
+      {
+          class SSLSocketFactory$ErrorSocketFactory;
+      }
+    }
+  }
+}
+
+class javax::net::ssl::SSLSocketFactory$ErrorSocketFactory : public ::javax::net::ssl::SSLSocketFactory
+{
+
+public: // actually package-private
+  SSLSocketFactory$ErrorSocketFactory(::java::lang::RuntimeException *);
+public:
+  ::java::net::Socket * createSocket();
+  ::java::net::Socket * createSocket(::java::lang::String *, jint);
+  ::java::net::Socket * createSocket(::java::lang::String *, jint, ::java::net::InetAddress *, jint);
+  ::java::net::Socket * createSocket(::java::net::InetAddress *, jint);
+  ::java::net::Socket * createSocket(::java::net::InetAddress *, jint, ::java::net::InetAddress *, jint);
+  JArray< ::java::lang::String * > * getDefaultCipherSuites();
+  JArray< ::java::lang::String * > * getSupportedCipherSuites();
+  ::java::net::Socket * createSocket(::java::net::Socket *, ::java::lang::String *, jint, jboolean);
+private:
+  ::java::lang::RuntimeException * __attribute__((aligned(__alignof__( ::javax::net::ssl::SSLSocketFactory)))) x;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_net_ssl_SSLSocketFactory$ErrorSocketFactory__
diff --git a/libjava/javax/sound/sampled/BooleanControl.h b/libjava/javax/sound/sampled/BooleanControl.h
index efb3ab4715d..eca5d354885 100644
--- a/libjava/javax/sound/sampled/BooleanControl.h
+++ b/libjava/javax/sound/sampled/BooleanControl.h
@@ -34,8 +34,7 @@ public:
   virtual void setValue(jboolean);
   virtual ::java::lang::String * toString();
 private:
-  ::javax::sound::sampled::BooleanControl$Type * __attribute__((aligned(__alignof__( ::javax::sound::sampled::Control)))) type;
-  jboolean value;
+  jboolean __attribute__((aligned(__alignof__( ::javax::sound::sampled::Control)))) value;
   ::java::lang::String * trueLabel;
   ::java::lang::String * falseLabel;
 public:
diff --git a/libjava/javax/swing/AbstractButton$2.h b/libjava/javax/swing/AbstractButton$2.h
deleted file mode 100644
index 1bb6bc29681..00000000000
--- a/libjava/javax/swing/AbstractButton$2.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_AbstractButton$2__
-#define __javax_swing_AbstractButton$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractButton;
-        class AbstractButton$2;
-    }
-  }
-}
-
-class javax::swing::AbstractButton$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AbstractButton$2(::javax::swing::AbstractButton *);
-public:
-  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$2__
diff --git a/libjava/javax/swing/AbstractButton$3.h b/libjava/javax/swing/AbstractButton$3.h
deleted file mode 100644
index 174029e5f26..00000000000
--- a/libjava/javax/swing/AbstractButton$3.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_AbstractButton$3__
-#define __javax_swing_AbstractButton$3__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ItemEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractButton;
-        class AbstractButton$3;
-    }
-  }
-}
-
-class javax::swing::AbstractButton$3 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AbstractButton$3(::javax::swing::AbstractButton *);
-public:
-  void itemStateChanged(::java::awt::event::ItemEvent *);
-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$3__
diff --git a/libjava/javax/swing/JComponent.h b/libjava/javax/swing/JComponent.h
index e87a6c29076..a27b205093a 100644
--- a/libjava/javax/swing/JComponent.h
+++ b/libjava/javax/swing/JComponent.h
@@ -95,7 +95,6 @@ public: // actually protected
 public:
   virtual void firePropertyChange(::java::lang::String *, jint, jint);
   virtual void firePropertyChange(::java::lang::String *, jboolean, jboolean);
-  virtual void firePropertyChange(::java::lang::String *, jchar, jchar);
   virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
   virtual jfloat getAlignmentX();
   virtual jfloat getAlignmentY();
diff --git a/libjava/javax/swing/TransferHandler$SwingDragGestureRecognizer.h b/libjava/javax/swing/TransferHandler$SwingDragGestureRecognizer.h
new file mode 100644
index 00000000000..03c7f18e833
--- /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 00000000000..7b7631ca907
--- /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.h b/libjava/javax/swing/TransferHandler.h
index 24220c88c1a..f7ae8049286 100644
--- a/libjava/javax/swing/TransferHandler.h
+++ b/libjava/javax/swing/TransferHandler.h
@@ -39,6 +39,7 @@ extern "Java"
         class Icon;
         class JComponent;
         class TransferHandler;
+        class TransferHandler$SwingDragGestureRecognizer;
     }
   }
 }
@@ -85,6 +86,7 @@ private:
   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$;
 };
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup.h b/libjava/javax/swing/plaf/basic/BasicComboPopup.h
index 4c878caa61c..7dfc5250628 100644
--- a/libjava/javax/swing/plaf/basic/BasicComboPopup.h
+++ b/libjava/javax/swing/plaf/basic/BasicComboPopup.h
@@ -103,9 +103,7 @@ public: // actually protected
   virtual ::java::awt::Rectangle * computePopupBounds(jint, jint, jint, jint);
   virtual void updateListBoxSelectionForEvent(::java::awt::event::MouseEvent *, jboolean);
 private:
-  void uninstallListeners();
   void uninstallListListeners();
-  void uninstallComboBoxListeners();
 public: // actually package-private
   virtual void syncListSelection();
 public: // actually protected
diff --git a/libjava/javax/swing/plaf/basic/BasicLabelUI.h b/libjava/javax/swing/plaf/basic/BasicLabelUI.h
index e0d39a24189..5c67114230e 100644
--- a/libjava/javax/swing/plaf/basic/BasicLabelUI.h
+++ b/libjava/javax/swing/plaf/basic/BasicLabelUI.h
@@ -16,6 +16,7 @@ extern "Java"
         class Dimension;
         class FontMetrics;
         class Graphics;
+        class Insets;
         class Rectangle;
     }
     namespace beans
@@ -70,12 +71,15 @@ public: // actually protected
   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$;
 };
diff --git a/libjava/javax/swing/plaf/basic/BasicRadioButtonUI.h b/libjava/javax/swing/plaf/basic/BasicRadioButtonUI.h
index 62b3a3c2823..deea3858586 100644
--- a/libjava/javax/swing/plaf/basic/BasicRadioButtonUI.h
+++ b/libjava/javax/swing/plaf/basic/BasicRadioButtonUI.h
@@ -49,6 +49,9 @@ public: // actually protected
 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 *);
diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI$1.h b/libjava/javax/swing/plaf/basic/BasicTextUI$1.h
deleted file mode 100644
index 8736761e504..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTextUI$1.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTextUI$1__
-#define __javax_swing_plaf_basic_BasicTextUI$1__
-
-#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;
-            class BasicTextUI$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTextUI$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicTextUI$1(::javax::swing::plaf::basic::BasicTextUI *);
-public:
-  void focusGained(::java::awt::event::FocusEvent *);
-  void focusLost(::java::awt::event::FocusEvent *);
-public: // actually package-private
-  ::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$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI$DocumentHandler.h b/libjava/javax/swing/plaf/basic/BasicTextUI$DocumentHandler.h
deleted file mode 100644
index 38e9f49998a..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTextUI$DocumentHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTextUI$DocumentHandler__
-#define __javax_swing_plaf_basic_BasicTextUI$DocumentHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTextUI;
-            class BasicTextUI$DocumentHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTextUI$DocumentHandler : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicTextUI$DocumentHandler(::javax::swing::plaf::basic::BasicTextUI *);
-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
-  ::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$DocumentHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicTextUI$PropertyChangeHandler.h
deleted file mode 100644
index bba4ad46b7b..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTextUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTextUI$PropertyChangeHandler__
-#define __javax_swing_plaf_basic_BasicTextUI$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 BasicTextUI;
-            class BasicTextUI$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTextUI$PropertyChangeHandler : public ::java::lang::Object
-{
-
-  BasicTextUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicTextUI *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  BasicTextUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicTextUI *, ::javax::swing::plaf::basic::BasicTextUI$PropertyChangeHandler *);
-  ::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$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$2.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$2.h
deleted file mode 100644
index d71232d451f..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$2.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$2__
-#define __javax_swing_plaf_basic_BasicTreeUI$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 BasicTreeUI;
-            class BasicTreeUI$2;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicTreeUI$2(::javax::swing::plaf::basic::BasicTreeUI *);
-public:
-  jint getIconHeight();
-  jint getIconWidth();
-  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$2__
diff --git a/libjava/javax/swing/plaf/metal/MetalLookAndFeel.h b/libjava/javax/swing/plaf/metal/MetalLookAndFeel.h
index 9985b60b9e6..10a386dd093 100644
--- a/libjava/javax/swing/plaf/metal/MetalLookAndFeel.h
+++ b/libjava/javax/swing/plaf/metal/MetalLookAndFeel.h
@@ -95,7 +95,6 @@ public:
 private:
   static const jlong serialVersionUID = 6680646159193457980LL;
   static ::javax::swing::plaf::metal::MetalTheme * theme;
-  ::javax::swing::UIDefaults * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicLookAndFeel)))) LAF_defaults;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/javax/swing/plaf/metal/MetalSplitPaneDivider$MetalDividerLayout.h b/libjava/javax/swing/plaf/metal/MetalSplitPaneDivider$MetalDividerLayout.h
deleted file mode 100644
index 707fe29327c..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalSplitPaneDivider$MetalDividerLayout.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalSplitPaneDivider$MetalDividerLayout__
-#define __javax_swing_plaf_metal_MetalSplitPaneDivider$MetalDividerLayout__
-
-#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 BasicArrowButton;
-        }
-        namespace metal
-        {
-            class MetalSplitPaneDivider;
-            class MetalSplitPaneDivider$MetalDividerLayout;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalSplitPaneDivider$MetalDividerLayout : public ::java::lang::Object
-{
-
-public:
-  MetalSplitPaneDivider$MetalDividerLayout(::javax::swing::plaf::metal::MetalSplitPaneDivider *);
-  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::BasicArrowButton * __attribute__((aligned(__alignof__( ::java::lang::Object)))) rb;
-  ::javax::swing::plaf::basic::BasicArrowButton * lb;
-  ::javax::swing::plaf::metal::MetalSplitPaneDivider * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalSplitPaneDivider$MetalDividerLayout__
diff --git a/libjava/javax/swing/text/AbstractDocument$1.h b/libjava/javax/swing/text/AbstractDocument$1.h
deleted file mode 100644
index b433e142189..00000000000
--- a/libjava/javax/swing/text/AbstractDocument$1.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AbstractDocument$1__
-#define __javax_swing_text_AbstractDocument$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AbstractDocument;
-          class AbstractDocument$1;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AbstractDocument$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AbstractDocument$1(::javax::swing::text::AbstractDocument *);
-public:
-  jint getOffset();
-public: // actually package-private
-  ::javax::swing::text::AbstractDocument * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_AbstractDocument$1__
diff --git a/libjava/javax/swing/text/AbstractDocument$2.h b/libjava/javax/swing/text/AbstractDocument$2.h
deleted file mode 100644
index dc504ce9eea..00000000000
--- a/libjava/javax/swing/text/AbstractDocument$2.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AbstractDocument$2__
-#define __javax_swing_text_AbstractDocument$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AbstractDocument;
-          class AbstractDocument$2;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AbstractDocument$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AbstractDocument$2(::javax::swing::text::AbstractDocument *);
-public:
-  jint getOffset();
-public: // actually package-private
-  ::javax::swing::text::AbstractDocument * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_AbstractDocument$2__
diff --git a/libjava/javax/swing/text/DefaultStyledDocument$Edit.h b/libjava/javax/swing/text/DefaultStyledDocument$Edit.h
deleted file mode 100644
index 7d63ab29ef0..00000000000
--- a/libjava/javax/swing/text/DefaultStyledDocument$Edit.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultStyledDocument$Edit__
-#define __javax_swing_text_DefaultStyledDocument$Edit__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultStyledDocument;
-          class DefaultStyledDocument$Edit;
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultStyledDocument$Edit : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::javax::swing::text::Element * > * getRemovedElements();
-  virtual JArray< ::javax::swing::text::Element * > * getAddedElements();
-private:
-  jboolean contains(::java::util::Vector *, ::javax::swing::text::Element *);
-public:
-  virtual void addRemovedElement(::javax::swing::text::Element *);
-  virtual void addRemovedElements(JArray< ::javax::swing::text::Element * > *);
-  virtual void addAddedElement(::javax::swing::text::Element *);
-  virtual void addAddedElements(JArray< ::javax::swing::text::Element * > *);
-  DefaultStyledDocument$Edit(::javax::swing::text::DefaultStyledDocument *, ::javax::swing::text::Element *, jint, JArray< ::javax::swing::text::Element * > *, JArray< ::javax::swing::text::Element * > *);
-public: // actually package-private
-  ::javax::swing::text::Element * __attribute__((aligned(__alignof__( ::java::lang::Object)))) e;
-  jint index;
-  ::java::util::Vector * removed;
-  ::java::util::Vector * added;
-  ::javax::swing::text::DefaultStyledDocument * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultStyledDocument$Edit__
diff --git a/libjava/javax/swing/text/InternationalFormatter.h b/libjava/javax/swing/text/InternationalFormatter.h
index 48f4726d6c5..e0c44dd44e1 100644
--- a/libjava/javax/swing/text/InternationalFormatter.h
+++ b/libjava/javax/swing/text/InternationalFormatter.h
@@ -49,6 +49,7 @@ public:
   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:
diff --git a/libjava/javax/swing/text/html/StyleSheet$CssParser.h b/libjava/javax/swing/text/html/StyleSheet$CssParser.h
deleted file mode 100644
index 5d2fded39da..00000000000
--- a/libjava/javax/swing/text/html/StyleSheet$CssParser.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_StyleSheet$CssParser__
-#define __javax_swing_text_html_StyleSheet$CssParser__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class MutableAttributeSet;
-        namespace html
-        {
-            class CSSParser;
-            class StyleSheet;
-            class StyleSheet$CssParser;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::StyleSheet$CssParser : public ::java::lang::Object
-{
-
-public: // actually package-private
-  StyleSheet$CssParser(::javax::swing::text::html::StyleSheet *);
-public:
-  virtual ::javax::swing::text::AttributeSet * parseDeclaration(::java::lang::String *);
-  virtual ::javax::swing::text::AttributeSet * parseDeclaration(::java::io::Reader *);
-  virtual void parse(::java::net::URL *, ::java::io::Reader *, jboolean, jboolean);
-  virtual void handleImport(::java::lang::String *);
-  virtual void handleSelector(::java::lang::String *);
-  virtual void startRule();
-  virtual void handleProperty(::java::lang::String *);
-  virtual void handleValue(::java::lang::String *);
-  virtual void endRule();
-private:
-  void addSelector();
-public: // actually package-private
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) selectors;
-  ::java::util::Vector * selectorTokens;
-  ::java::lang::String * propertyName;
-  ::javax::swing::text::MutableAttributeSet * declaration;
-  jboolean parsingDeclaration;
-  jboolean isLink;
-  ::java::net::URL * base;
-  ::javax::swing::text::html::CSSParser * parser;
-  ::javax::swing::text::html::StyleSheet * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_StyleSheet$CssParser__
diff --git a/libjava/javax/swing/tree/DefaultTreeCellEditor$RealEditorListener.h b/libjava/javax/swing/tree/DefaultTreeCellEditor$RealEditorListener.h
deleted file mode 100644
index cc889e4cd16..00000000000
--- a/libjava/javax/swing/tree/DefaultTreeCellEditor$RealEditorListener.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_DefaultTreeCellEditor$RealEditorListener__
-#define __javax_swing_tree_DefaultTreeCellEditor$RealEditorListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-      }
-      namespace tree
-      {
-          class DefaultTreeCellEditor;
-          class DefaultTreeCellEditor$RealEditorListener;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::DefaultTreeCellEditor$RealEditorListener : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DefaultTreeCellEditor$RealEditorListener(::javax::swing::tree::DefaultTreeCellEditor *);
-public:
-  virtual void editingCanceled(::javax::swing::event::ChangeEvent *);
-  virtual void editingStopped(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::tree::DefaultTreeCellEditor * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_DefaultTreeCellEditor$RealEditorListener__