libjava/

2008-06-28  Matthias Klose  <doko@ubuntu.com>

        Import GNU Classpath (classpath-0_97_2-release).

        * Regenerate class and header files.
        * Regenerate auto* files.
        * gcj/javaprims.h: Define jobjectRefType.
        * jni.cc (_Jv_JNI_GetObjectRefType): New (stub only).
        (_Jv_JNIFunctions): Initialize GetObjectRefType.
        * gnu/classpath/jdwp/VMVirtualMachine.java,
        java/security/VMSecureRandom.java: Merge from classpath.
        * HACKING: Fix typo.
        * ChangeLog-2007: New file.
        * configure.ac: Set JAVAC, pass --disable-regen-headers to classpath.

libjava/classpath/

2008-06-28  Matthias Klose  <doko@ubuntu.com>

        * m4/ac_prog_javac.m4: Disable check for JAVAC, when
        not configured with --enable-java-maintainer-mode.
        * aclocal.m4, configure: Regenerate.
        * native/jni/gstreamer-peer/Makefile.am: Do not link with
        libclasspathnative.
        * native/jni/gstreamer-peer/Makefile.in: Regenerate.
        * tools/Makefile.am, lib/Makefile.am: Use JAVAC for setting
        JCOMPILER, drop flags not understood by gcj.


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

18 files changed, 373 insertions, 10 deletions

diff --git a/libjava/javax/accessibility/AccessibleAction.h b/libjava/javax/accessibility/AccessibleAction.h
index ede23c9d2c4..5a8b4b28a00 100644
--- a/libjava/javax/accessibility/AccessibleAction.h
+++ b/libjava/javax/accessibility/AccessibleAction.h
@@ -28,6 +28,8 @@ public:
   static ::java::lang::String * DECREMENT;
   static ::java::lang::String * INCREMENT;
   static ::java::lang::String * TOGGLE_EXPAND;
+  static ::java::lang::String * CLICK;
+  static ::java::lang::String * TOGGLE_POPUP;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
 
diff --git a/libjava/javax/accessibility/AccessibleAttributeSequence.h b/libjava/javax/accessibility/AccessibleAttributeSequence.h
index e9d76b02db1..10d85711db1 100644
--- a/libjava/javax/accessibility/AccessibleAttributeSequence.h
+++ b/libjava/javax/accessibility/AccessibleAttributeSequence.h
@@ -29,7 +29,7 @@ class javax::accessibility::AccessibleAttributeSequence : public ::java::lang::O
 {
 
 public:
-  AccessibleAttributeSequence();
+  AccessibleAttributeSequence(jint, jint, ::javax::swing::text::AttributeSet *);
   ::javax::swing::text::AttributeSet * __attribute__((aligned(__alignof__( ::java::lang::Object)))) attributes;
   jint startIndex;
   jint endIndex;
diff --git a/libjava/javax/accessibility/AccessibleRole.h b/libjava/javax/accessibility/AccessibleRole.h
index 1fd9e3cf0d4..271b6ba7b7b 100644
--- a/libjava/javax/accessibility/AccessibleRole.h
+++ b/libjava/javax/accessibility/AccessibleRole.h
@@ -86,6 +86,7 @@ public:
   static ::javax::accessibility::AccessibleRole * PARAGRAPH;
   static ::javax::accessibility::AccessibleRole * PROGRESS_MONITOR;
   static ::javax::accessibility::AccessibleRole * RULER;
+  static ::javax::accessibility::AccessibleRole * HTML_CONTAINER;
   static ::java::lang::Class class$;
 };
 
diff --git a/libjava/javax/accessibility/AccessibleTextSequence.h b/libjava/javax/accessibility/AccessibleTextSequence.h
index 0c447e0fb21..280ad30886f 100644
--- a/libjava/javax/accessibility/AccessibleTextSequence.h
+++ b/libjava/javax/accessibility/AccessibleTextSequence.h
@@ -22,7 +22,7 @@ class javax::accessibility::AccessibleTextSequence : public ::java::lang::Object
 {
 
 public:
-  AccessibleTextSequence();
+  AccessibleTextSequence(jint, jint, ::java::lang::String *);
   ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) text;
   jint startIndex;
   jint endIndex;
diff --git a/libjava/javax/management/remote/NotificationResult.h b/libjava/javax/management/remote/NotificationResult.h
new file mode 100644
index 00000000000..b5d45f6b4a6
--- /dev/null
+++ b/libjava/javax/management/remote/NotificationResult.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_management_remote_NotificationResult__
+#define __javax_management_remote_NotificationResult__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace management
+    {
+      namespace remote
+      {
+          class NotificationResult;
+          class TargetedNotification;
+      }
+    }
+  }
+}
+
+class javax::management::remote::NotificationResult : public ::java::lang::Object
+{
+
+public:
+  NotificationResult(jlong, jlong, JArray< ::javax::management::remote::TargetedNotification * > *);
+  virtual jlong getEarliestSequenceNumber();
+  virtual jlong getNextSequenceNumber();
+  virtual JArray< ::javax::management::remote::TargetedNotification * > * getTargetedNotifications();
+  virtual ::java::lang::String * toString();
+private:
+  static const jlong serialVersionUID = 1191800228721395279LL;
+  jlong __attribute__((aligned(__alignof__( ::java::lang::Object)))) earliestSequenceNumber;
+  jlong nextSequenceNumber;
+  JArray< ::javax::management::remote::TargetedNotification * > * targetedNotifications;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_management_remote_NotificationResult__
diff --git a/libjava/javax/management/remote/TargetedNotification.h b/libjava/javax/management/remote/TargetedNotification.h
new file mode 100644
index 00000000000..1021a872c3a
--- /dev/null
+++ b/libjava/javax/management/remote/TargetedNotification.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_management_remote_TargetedNotification__
+#define __javax_management_remote_TargetedNotification__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace management
+    {
+        class Notification;
+      namespace remote
+      {
+          class TargetedNotification;
+      }
+    }
+  }
+}
+
+class javax::management::remote::TargetedNotification : public ::java::lang::Object
+{
+
+public:
+  TargetedNotification(::javax::management::Notification *, ::java::lang::Integer *);
+  virtual ::javax::management::Notification * getNotification();
+  virtual ::java::lang::Integer * getListenerID();
+  virtual ::java::lang::String * toString();
+private:
+  static const jlong serialVersionUID = 7676132089779300926LL;
+  ::javax::management::Notification * __attribute__((aligned(__alignof__( ::java::lang::Object)))) notif;
+  ::java::lang::Integer * id;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_management_remote_TargetedNotification__
diff --git a/libjava/javax/management/remote/rmi/RMIConnection.h b/libjava/javax/management/remote/rmi/RMIConnection.h
new file mode 100644
index 00000000000..4fb6eb86d7b
--- /dev/null
+++ b/libjava/javax/management/remote/rmi/RMIConnection.h
@@ -0,0 +1,82 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_management_remote_rmi_RMIConnection__
+#define __javax_management_remote_rmi_RMIConnection__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace rmi
+    {
+        class MarshalledObject;
+    }
+  }
+  namespace javax
+  {
+    namespace management
+    {
+        class AttributeList;
+        class MBeanInfo;
+        class ObjectInstance;
+        class ObjectName;
+      namespace remote
+      {
+          class NotificationResult;
+        namespace rmi
+        {
+            class RMIConnection;
+        }
+      }
+    }
+    namespace security
+    {
+      namespace auth
+      {
+          class Subject;
+      }
+    }
+  }
+}
+
+class javax::management::remote::rmi::RMIConnection : public ::java::lang::Object
+{
+
+public:
+  virtual void addNotificationListener(::javax::management::ObjectName *, ::javax::management::ObjectName *, ::java::rmi::MarshalledObject *, ::java::rmi::MarshalledObject *, ::javax::security::auth::Subject *) = 0;
+  virtual JArray< ::java::lang::Integer * > * addNotificationListeners(JArray< ::javax::management::ObjectName * > *, JArray< ::java::rmi::MarshalledObject * > *, JArray< ::javax::security::auth::Subject * > *) = 0;
+  virtual void close() = 0;
+  virtual ::javax::management::ObjectInstance * createMBean(::java::lang::String *, ::javax::management::ObjectName *, ::java::rmi::MarshalledObject *, JArray< ::java::lang::String * > *, ::javax::security::auth::Subject *) = 0;
+  virtual ::javax::management::ObjectInstance * createMBean(::java::lang::String *, ::javax::management::ObjectName *, ::javax::management::ObjectName *, ::java::rmi::MarshalledObject *, JArray< ::java::lang::String * > *, ::javax::security::auth::Subject *) = 0;
+  virtual ::javax::management::ObjectInstance * createMBean(::java::lang::String *, ::javax::management::ObjectName *, ::javax::management::ObjectName *, ::javax::security::auth::Subject *) = 0;
+  virtual ::javax::management::ObjectInstance * createMBean(::java::lang::String *, ::javax::management::ObjectName *, ::javax::security::auth::Subject *) = 0;
+  virtual ::javax::management::remote::NotificationResult * fetchNotifications(jlong, jint, jlong) = 0;
+  virtual ::java::lang::Object * getAttribute(::javax::management::ObjectName *, ::java::lang::String *, ::javax::security::auth::Subject *) = 0;
+  virtual ::javax::management::AttributeList * getAttributes(::javax::management::ObjectName *, JArray< ::java::lang::String * > *, ::javax::security::auth::Subject *) = 0;
+  virtual ::java::lang::String * getConnectionId() = 0;
+  virtual ::java::lang::String * getDefaultDomain(::javax::security::auth::Subject *) = 0;
+  virtual JArray< ::java::lang::String * > * getDomains(::javax::security::auth::Subject *) = 0;
+  virtual ::java::lang::Integer * getMBeanCount(::javax::security::auth::Subject *) = 0;
+  virtual ::javax::management::MBeanInfo * getMBeanInfo(::javax::management::ObjectName *, ::javax::security::auth::Subject *) = 0;
+  virtual ::javax::management::ObjectInstance * getObjectInstance(::javax::management::ObjectName *, ::javax::security::auth::Subject *) = 0;
+  virtual ::java::lang::Object * invoke(::javax::management::ObjectName *, ::java::lang::String *, ::java::rmi::MarshalledObject *, JArray< ::java::lang::String * > *, ::javax::security::auth::Subject *) = 0;
+  virtual jboolean isInstanceOf(::javax::management::ObjectName *, ::java::lang::String *, ::javax::security::auth::Subject *) = 0;
+  virtual jboolean isRegistered(::javax::management::ObjectName *, ::javax::security::auth::Subject *) = 0;
+  virtual ::java::util::Set * queryMBeans(::javax::management::ObjectName *, ::java::rmi::MarshalledObject *, ::javax::security::auth::Subject *) = 0;
+  virtual ::java::util::Set * queryNames(::javax::management::ObjectName *, ::java::rmi::MarshalledObject *, ::javax::security::auth::Subject *) = 0;
+  virtual void removeNotificationListener(::javax::management::ObjectName *, ::javax::management::ObjectName *, ::java::rmi::MarshalledObject *, ::java::rmi::MarshalledObject *, ::javax::security::auth::Subject *) = 0;
+  virtual void removeNotificationListener(::javax::management::ObjectName *, ::javax::management::ObjectName *, ::javax::security::auth::Subject *) = 0;
+  virtual void removeNotificationListeners(::javax::management::ObjectName *, JArray< ::java::lang::Integer * > *, ::javax::security::auth::Subject *) = 0;
+  virtual void setAttribute(::javax::management::ObjectName *, ::java::rmi::MarshalledObject *, ::javax::security::auth::Subject *) = 0;
+  virtual ::javax::management::AttributeList * setAttributes(::javax::management::ObjectName *, ::java::rmi::MarshalledObject *, ::javax::security::auth::Subject *) = 0;
+  virtual void unregisterMBean(::javax::management::ObjectName *, ::javax::security::auth::Subject *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_management_remote_rmi_RMIConnection__
diff --git a/libjava/javax/management/remote/rmi/RMIServer.h b/libjava/javax/management/remote/rmi/RMIServer.h
new file mode 100644
index 00000000000..3c955a5010e
--- /dev/null
+++ b/libjava/javax/management/remote/rmi/RMIServer.h
@@ -0,0 +1,37 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_management_remote_rmi_RMIServer__
+#define __javax_management_remote_rmi_RMIServer__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace management
+    {
+      namespace remote
+      {
+        namespace rmi
+        {
+            class RMIConnection;
+            class RMIServer;
+        }
+      }
+    }
+  }
+}
+
+class javax::management::remote::rmi::RMIServer : public ::java::lang::Object
+{
+
+public:
+  virtual ::java::lang::String * getVersion() = 0;
+  virtual ::javax::management::remote::rmi::RMIConnection * newClient(::java::lang::Object *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_management_remote_rmi_RMIServer__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI.h b/libjava/javax/swing/plaf/basic/BasicTreeUI.h
index 134cb2f3df8..42159f13bc7 100644
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI.h
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI.h
@@ -272,7 +272,6 @@ public: // actually package-private
   ::javax::swing::event::TreeExpansionListener * treeExpansionListener;
   ::javax::swing::event::TreeModelListener * treeModelListener;
   static ::javax::swing::Icon * nullIcon;
-  static ::java::awt::event::MouseEvent * EDIT;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/javax/swing/tree/DefaultMutableTreeNode$BreadthFirstEnumeration.h b/libjava/javax/swing/tree/DefaultMutableTreeNode$BreadthFirstEnumeration.h
index 50c7118f8dd..9c13e759163 100644
--- a/libjava/javax/swing/tree/DefaultMutableTreeNode$BreadthFirstEnumeration.h
+++ b/libjava/javax/swing/tree/DefaultMutableTreeNode$BreadthFirstEnumeration.h
@@ -29,6 +29,7 @@ public: // actually package-private
   DefaultMutableTreeNode$BreadthFirstEnumeration(::javax::swing::tree::TreeNode *);
 public:
   virtual jboolean hasMoreElements();
+  virtual ::javax::swing::tree::TreeNode * DefaultMutableTreeNode$BreadthFirstEnumeration$nextElement();
   virtual ::java::lang::Object * nextElement();
 public: // actually package-private
   ::java::util::LinkedList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) queue;
diff --git a/libjava/javax/swing/tree/DefaultMutableTreeNode$PostorderEnumeration.h b/libjava/javax/swing/tree/DefaultMutableTreeNode$PostorderEnumeration.h
index 629c2943bbc..31065d6690d 100644
--- a/libjava/javax/swing/tree/DefaultMutableTreeNode$PostorderEnumeration.h
+++ b/libjava/javax/swing/tree/DefaultMutableTreeNode$PostorderEnumeration.h
@@ -29,9 +29,11 @@ public: // actually package-private
   DefaultMutableTreeNode$PostorderEnumeration(::javax::swing::tree::TreeNode *);
 public:
   virtual jboolean hasMoreElements();
-  virtual ::java::lang::Object * nextElement();
+  virtual ::javax::swing::tree::TreeNode * DefaultMutableTreeNode$PostorderEnumeration$nextElement();
 private:
-  ::java::lang::Object * traverse(::java::util::Enumeration *);
+  ::javax::swing::tree::TreeNode * traverse(::java::util::Enumeration *);
+public:
+  virtual ::java::lang::Object * nextElement();
 public: // actually package-private
   ::java::util::Stack * __attribute__((aligned(__alignof__( ::java::lang::Object)))) nodes;
   ::java::util::Stack * childrenEnums;
diff --git a/libjava/javax/swing/tree/DefaultMutableTreeNode$PreorderEnumeration.h b/libjava/javax/swing/tree/DefaultMutableTreeNode$PreorderEnumeration.h
index 53e87c3e295..98117b06fec 100644
--- a/libjava/javax/swing/tree/DefaultMutableTreeNode$PreorderEnumeration.h
+++ b/libjava/javax/swing/tree/DefaultMutableTreeNode$PreorderEnumeration.h
@@ -29,9 +29,11 @@ public: // actually package-private
   DefaultMutableTreeNode$PreorderEnumeration(::javax::swing::tree::TreeNode *);
 public:
   virtual jboolean hasMoreElements();
-  virtual ::java::lang::Object * nextElement();
+  virtual ::javax::swing::tree::TreeNode * DefaultMutableTreeNode$PreorderEnumeration$nextElement();
 private:
   ::javax::swing::tree::TreeNode * traverse(::java::util::Enumeration *);
+public:
+  virtual ::java::lang::Object * nextElement();
 public: // actually package-private
   ::javax::swing::tree::TreeNode * __attribute__((aligned(__alignof__( ::java::lang::Object)))) next;
   ::java::util::Stack * childrenEnums;
diff --git a/libjava/javax/swing/tree/DefaultTreeCellEditor.h b/libjava/javax/swing/tree/DefaultTreeCellEditor.h
index 759439c189f..bac3f21ad97 100644
--- a/libjava/javax/swing/tree/DefaultTreeCellEditor.h
+++ b/libjava/javax/swing/tree/DefaultTreeCellEditor.h
@@ -56,7 +56,6 @@ public:
   DefaultTreeCellEditor(::javax::swing::JTree *, ::javax::swing::tree::DefaultTreeCellRenderer *);
   DefaultTreeCellEditor(::javax::swing::JTree *, ::javax::swing::tree::DefaultTreeCellRenderer *, ::javax::swing::tree::TreeCellEditor *);
 private:
-  void configureEditingComponent(::javax::swing::JTree *, ::javax::swing::tree::DefaultTreeCellRenderer *, ::javax::swing::tree::TreeCellEditor *);
   void writeObject(::java::io::ObjectOutputStream *);
   void readObject(::java::io::ObjectInputStream *);
 public:
@@ -104,8 +103,6 @@ public: // actually protected
   ::java::awt::Color * borderSelectionColor;
   ::javax::swing::Icon * editingIcon;
   ::java::awt::Font * font;
-private:
-  ::javax::swing::tree::TreePath * tPath;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/javax/tools/Diagnostic$Kind.h b/libjava/javax/tools/Diagnostic$Kind.h
new file mode 100644
index 00000000000..006ed7d91d4
--- /dev/null
+++ b/libjava/javax/tools/Diagnostic$Kind.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_tools_Diagnostic$Kind__
+#define __javax_tools_Diagnostic$Kind__
+
+#pragma interface
+
+#include <java/lang/Enum.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace tools
+    {
+        class Diagnostic$Kind;
+    }
+  }
+}
+
+class javax::tools::Diagnostic$Kind : public ::java::lang::Enum
+{
+
+  Diagnostic$Kind(::java::lang::String *, jint);
+public:
+  static JArray< ::javax::tools::Diagnostic$Kind * > * values();
+  static ::javax::tools::Diagnostic$Kind * valueOf(::java::lang::String *);
+  static ::javax::tools::Diagnostic$Kind * ERROR;
+  static ::javax::tools::Diagnostic$Kind * WARNING;
+  static ::javax::tools::Diagnostic$Kind * MANDATORY_WARNING;
+  static ::javax::tools::Diagnostic$Kind * NOTE;
+  static ::javax::tools::Diagnostic$Kind * OTHER;
+private:
+  static JArray< ::javax::tools::Diagnostic$Kind * > * ENUM$VALUES;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_tools_Diagnostic$Kind__
diff --git a/libjava/javax/tools/Diagnostic.h b/libjava/javax/tools/Diagnostic.h
new file mode 100644
index 00000000000..540da44e55a
--- /dev/null
+++ b/libjava/javax/tools/Diagnostic.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_tools_Diagnostic__
+#define __javax_tools_Diagnostic__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace tools
+    {
+        class Diagnostic;
+        class Diagnostic$Kind;
+    }
+  }
+}
+
+class javax::tools::Diagnostic : public ::java::lang::Object
+{
+
+public:
+  virtual ::javax::tools::Diagnostic$Kind * getKind() = 0;
+  virtual ::java::lang::Object * getSource() = 0;
+  virtual jlong getPosition() = 0;
+  virtual jlong getStartPosition() = 0;
+  virtual jlong getEndPosition() = 0;
+  virtual jlong getLineNumber() = 0;
+  virtual jlong getColumnNumber() = 0;
+  virtual ::java::lang::String * getCode() = 0;
+  virtual ::java::lang::String * getMessage(::java::util::Locale *) = 0;
+  static const jlong NOPOS = -1LL;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_tools_Diagnostic__
diff --git a/libjava/javax/tools/DiagnosticListener.h b/libjava/javax/tools/DiagnosticListener.h
new file mode 100644
index 00000000000..a0d1a3763bd
--- /dev/null
+++ b/libjava/javax/tools/DiagnosticListener.h
@@ -0,0 +1,30 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_tools_DiagnosticListener__
+#define __javax_tools_DiagnosticListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace tools
+    {
+        class Diagnostic;
+        class DiagnosticListener;
+    }
+  }
+}
+
+class javax::tools::DiagnosticListener : public ::java::lang::Object
+{
+
+public:
+  virtual void report(::javax::tools::Diagnostic *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_tools_DiagnosticListener__
diff --git a/libjava/javax/tools/FileObject.h b/libjava/javax/tools/FileObject.h
new file mode 100644
index 00000000000..87acd835a5d
--- /dev/null
+++ b/libjava/javax/tools/FileObject.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_tools_FileObject__
+#define __javax_tools_FileObject__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace net
+    {
+        class URI;
+    }
+  }
+  namespace javax
+  {
+    namespace tools
+    {
+        class FileObject;
+    }
+  }
+}
+
+class javax::tools::FileObject : public ::java::lang::Object
+{
+
+public:
+  virtual ::java::net::URI * toURI() = 0;
+  virtual ::java::lang::String * getName() = 0;
+  virtual ::java::io::InputStream * openInputStream() = 0;
+  virtual ::java::io::OutputStream * openOutputStream() = 0;
+  virtual ::java::io::Reader * openReader() = 0;
+  virtual ::java::lang::CharSequence * getCharContent(jboolean) = 0;
+  virtual ::java::io::Writer * openWriter() = 0;
+  virtual jlong getLastModified() = 0;
+  virtual jboolean delete$() = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_tools_FileObject__
diff --git a/libjava/javax/xml/stream/events/Attribute.h b/libjava/javax/xml/stream/events/Attribute.h
index 7362510c072..f0e057063be 100644
--- a/libjava/javax/xml/stream/events/Attribute.h
+++ b/libjava/javax/xml/stream/events/Attribute.h
@@ -38,7 +38,7 @@ class javax::xml::stream::events::Attribute : public ::java::lang::Object
 public:
   virtual ::javax::xml::namespace::QName * getName() = 0;
   virtual ::java::lang::String * getValue() = 0;
-  virtual ::javax::xml::namespace::QName * getDTDType() = 0;
+  virtual ::java::lang::String * getDTDType() = 0;
   virtual jboolean isSpecified() = 0;
   virtual jint getEventType() = 0;
   virtual ::javax::xml::stream::Location * getLocation() = 0;