9 files changed, 105 insertions, 6 deletions
diff --git a/libjava/javax/security/auth/kerberos/KerberosTicket.h b/libjava/javax/security/auth/kerberos/KerberosTicket.h
index 44c35b4c78d..d92309354c2 100644
--- a/libjava/javax/security/auth/kerberos/KerberosTicket.h
+++ b/libjava/javax/security/auth/kerberos/KerberosTicket.h
@@ -69,6 +69,7 @@ private:
   void checkDestroyed();
 public:
   virtual ::java::lang::String * toString();
+  virtual jint getSessionKeyType();
 private:
   static const jlong serialVersionUID = 7395334370157380539LL;
   static const jint FORWARDABLE = 1;
diff --git a/libjava/javax/security/auth/kerberos/KeyImpl.h b/libjava/javax/security/auth/kerberos/KeyImpl.h
index 39998ba2219..4aa9563135b 100644
--- a/libjava/javax/security/auth/kerberos/KeyImpl.h
+++ b/libjava/javax/security/auth/kerberos/KeyImpl.h
@@ -35,6 +35,7 @@ public:
   ::java::lang::String * getAlgorithm();
   JArray< jbyte > * getEncoded();
   ::java::lang::String * getFormat();
+  ::java::lang::String * toString();
   ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) algorithm;
   jint type;
   JArray< jbyte > * key;
diff --git a/libjava/javax/swing/text/html/HTMLWriter.h b/libjava/javax/swing/text/html/HTMLWriter.h
index 321b58d1020..63684b7933b 100644
--- a/libjava/javax/swing/text/html/HTMLWriter.h
+++ b/libjava/javax/swing/text/html/HTMLWriter.h
@@ -66,7 +66,7 @@ private:
   ::java::lang::String * escapeCharHtmlEntity(jchar);
   ::java::io::Writer * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractWriter)))) outWriter;
   ::javax::swing::text::html::HTMLDocument * htmlDoc;
-  ::java::util::HashSet * openEmbededTagHashSet;
+  ::java::util::HashSet * openEmbeddedTagHashSet;
   ::java::lang::String * new_line_str;
   JArray< jchar > * html_entity_char_arr;
   JArray< ::java::lang::String * > * html_entity_escape_str_arr;
diff --git a/libjava/javax/swing/text/html/MinimalHTMLWriter.h b/libjava/javax/swing/text/html/MinimalHTMLWriter.h
index c46afec29b5..a44b170055d 100644
--- a/libjava/javax/swing/text/html/MinimalHTMLWriter.h
+++ b/libjava/javax/swing/text/html/MinimalHTMLWriter.h
@@ -71,7 +71,7 @@ private:
   void writeStyle(::javax::swing::text::Style *);
   jboolean hasText(::javax::swing::text::Element *);
   ::javax::swing::text::StyledDocument * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractWriter)))) doc;
-  ::java::util::Stack * tagStack;
+  ::java::util::Deque * tagStack;
   jboolean inFontTag__;
 public:
   static ::java::lang::Class class$;
diff --git a/libjava/javax/swing/text/html/StyleSheet.h b/libjava/javax/swing/text/html/StyleSheet.h
index 3c9bbffdb19..57ebf9e3bf9 100644
--- a/libjava/javax/swing/text/html/StyleSheet.h
+++ b/libjava/javax/swing/text/html/StyleSheet.h
@@ -57,7 +57,7 @@ public:
 private:
   ::javax::swing::text::Style * getResolvedStyle(::java::lang::String *, ::java::util::List *, ::javax::swing::text::html::HTML$Tag *);
   ::javax::swing::text::Style * resolveStyle(::java::lang::String *, ::java::util::List *, ::javax::swing::text::html::HTML$Tag *);
-  ::javax::swing::text::Style * resolveStyle(::java::lang::String *, JArray< ::java::lang::String * > *, JArray< ::java::util::Map * > *);
+  ::javax::swing::text::Style * resolveStyle(::java::lang::String *, JArray< ::java::lang::String * > *, ::java::util::List *);
 public:
   virtual ::javax::swing::text::Style * getRule(::java::lang::String *);
   virtual void addRule(::java::lang::String *);
diff --git a/libjava/javax/xml/stream/XMLEventFactory.h b/libjava/javax/xml/stream/XMLEventFactory.h
index 493ceef3db1..d64a2859be1 100644
--- a/libjava/javax/xml/stream/XMLEventFactory.h
+++ b/libjava/javax/xml/stream/XMLEventFactory.h
@@ -49,7 +49,6 @@ public: // actually protected
   XMLEventFactory();
 public:
   static ::javax::xml::stream::XMLEventFactory * newInstance();
-public: // actually package-private
   static ::javax::xml::stream::XMLEventFactory * newInstance(::java::lang::String *, ::java::lang::ClassLoader *);
 private:
   static ::java::lang::String * getFactoryClassName(::java::lang::ClassLoader *, jint);
diff --git a/libjava/javax/xml/stream/XMLOutputFactory.h b/libjava/javax/xml/stream/XMLOutputFactory.h
index 362fac935f4..ad20deb70d9 100644
--- a/libjava/javax/xml/stream/XMLOutputFactory.h
+++ b/libjava/javax/xml/stream/XMLOutputFactory.h
@@ -16,7 +16,6 @@ extern "Java"
       namespace stream
       {
           class XMLEventWriter;
-          class XMLInputFactory;
           class XMLOutputFactory;
           class XMLStreamWriter;
       }
@@ -35,10 +34,10 @@ public: // actually protected
   XMLOutputFactory();
 public:
   static ::javax::xml::stream::XMLOutputFactory * newInstance();
+  static ::javax::xml::stream::XMLOutputFactory * newInstance(::java::lang::String *, ::java::lang::ClassLoader *);
 private:
   static ::java::lang::String * getFactoryClassName(::java::lang::ClassLoader *, jint);
 public:
-  static ::javax::xml::stream::XMLInputFactory * newInstance(::java::lang::String *, ::java::lang::ClassLoader *);
   virtual ::javax::xml::stream::XMLStreamWriter * createXMLStreamWriter(::java::io::Writer *) = 0;
   virtual ::javax::xml::stream::XMLStreamWriter * createXMLStreamWriter(::java::io::OutputStream *) = 0;
   virtual ::javax::xml::stream::XMLStreamWriter * createXMLStreamWriter(::java::io::OutputStream *, ::java::lang::String *) = 0;
diff --git a/libjava/javax/xml/stream/events/Namespace.h b/libjava/javax/xml/stream/events/Namespace.h
index 470b22bc46c..7c05ab8cf44 100644
--- a/libjava/javax/xml/stream/events/Namespace.h
+++ b/libjava/javax/xml/stream/events/Namespace.h
@@ -39,6 +39,10 @@ public:
   virtual ::java::lang::String * getPrefix() = 0;
   virtual ::java::lang::String * getNamespaceURI() = 0;
   virtual jboolean isDefaultNamespaceDeclaration() = 0;
+  virtual ::javax::xml::namespace$::QName * getName() = 0;
+  virtual ::java::lang::String * getValue() = 0;
+  virtual ::java::lang::String * getDTDType() = 0;
+  virtual jboolean isSpecified() = 0;
   virtual jint getEventType() = 0;
   virtual ::javax::xml::stream::Location * getLocation() = 0;
   virtual jboolean isStartElement() = 0;
diff --git a/libjava/javax/xml/stream/util/StreamReaderDelegate.h b/libjava/javax/xml/stream/util/StreamReaderDelegate.h
new file mode 100644
index 00000000000..86864cb5718
--- /dev/null
+++ b/libjava/javax/xml/stream/util/StreamReaderDelegate.h
@@ -0,0 +1,95 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_xml_stream_util_StreamReaderDelegate__
+#define __javax_xml_stream_util_StreamReaderDelegate__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace xml
+    {
+      namespace namespace$
+      {
+          class NamespaceContext;
+          class QName;
+      }
+      namespace stream
+      {
+          class Location;
+          class XMLStreamReader;
+        namespace util
+        {
+            class StreamReaderDelegate;
+        }
+      }
+    }
+  }
+}
+
+class javax::xml::stream::util::StreamReaderDelegate : public ::java::lang::Object
+{
+
+public:
+  StreamReaderDelegate();
+  StreamReaderDelegate(::javax::xml::stream::XMLStreamReader *);
+  virtual void setParent(::javax::xml::stream::XMLStreamReader *);
+  virtual ::javax::xml::stream::XMLStreamReader * getParent();
+  virtual jint next();
+  virtual jint nextTag();
+  virtual ::java::lang::String * getElementText();
+  virtual void require(jint, ::java::lang::String *, ::java::lang::String *);
+  virtual jboolean hasNext();
+  virtual void close();
+  virtual ::java::lang::String * getNamespaceURI(::java::lang::String *);
+  virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext();
+  virtual jboolean isStartElement();
+  virtual jboolean isEndElement();
+  virtual jboolean isCharacters();
+  virtual jboolean isWhiteSpace();
+  virtual ::java::lang::String * getAttributeValue(::java::lang::String *, ::java::lang::String *);
+  virtual jint getAttributeCount();
+  virtual ::javax::xml::namespace$::QName * getAttributeName(jint);
+  virtual ::java::lang::String * getAttributePrefix(jint);
+  virtual ::java::lang::String * getAttributeNamespace(jint);
+  virtual ::java::lang::String * getAttributeLocalName(jint);
+  virtual ::java::lang::String * getAttributeType(jint);
+  virtual ::java::lang::String * getAttributeValue(jint);
+  virtual jboolean isAttributeSpecified(jint);
+  virtual jint getNamespaceCount();
+  virtual ::java::lang::String * getNamespacePrefix(jint);
+  virtual ::java::lang::String * getNamespaceURI(jint);
+  virtual jint getEventType();
+  virtual ::java::lang::String * getText();
+  virtual jint getTextCharacters(jint, JArray< jchar > *, jint, jint);
+  virtual JArray< jchar > * getTextCharacters();
+  virtual jint getTextStart();
+  virtual jint getTextLength();
+  virtual ::java::lang::String * getEncoding();
+  virtual jboolean hasText();
+  virtual ::javax::xml::stream::Location * getLocation();
+  virtual ::javax::xml::namespace$::QName * getName();
+  virtual ::java::lang::String * getLocalName();
+  virtual jboolean hasName();
+  virtual ::java::lang::String * getNamespaceURI();
+  virtual ::java::lang::String * getPrefix();
+  virtual ::java::lang::String * getVersion();
+  virtual jboolean isStandalone();
+  virtual jboolean standaloneSet();
+  virtual ::java::lang::String * getCharacterEncodingScheme();
+  virtual ::java::lang::String * getPITarget();
+  virtual ::java::lang::String * getPIData();
+  virtual ::java::lang::Object * getProperty(::java::lang::String *);
+private:
+  ::javax::xml::stream::XMLStreamReader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) parent;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_xml_stream_util_StreamReaderDelegate__