6 files changed, 21 insertions, 9 deletions
diff --git a/libjava/gnu/javax/print/ipp/attribute/RequestedAttributes.h b/libjava/gnu/javax/print/ipp/attribute/RequestedAttributes.h
index 8ed5bc28c06..9a4b2567eb4 100644
--- a/libjava/gnu/javax/print/ipp/attribute/RequestedAttributes.h
+++ b/libjava/gnu/javax/print/ipp/attribute/RequestedAttributes.h
@@ -7,6 +7,8 @@
 #pragma interface
 
 #include <java/lang/Object.h>
+#include <gcj/array.h>
+
 extern "Java"
 {
   namespace gnu
@@ -33,7 +35,7 @@ class gnu::javax::print::ipp::attribute::RequestedAttributes : public ::java::la
 public:
   RequestedAttributes(::java::lang::String *);
   void addValue(::java::lang::String *);
-  ::java::util::List * getValues();
+  JArray< ::java::lang::String * > * getValues();
   ::java::lang::Class * getCategory();
   ::java::lang::String * getName();
   ::java::lang::String * toString();
diff --git a/libjava/gnu/javax/swing/text/html/css/Selector.h b/libjava/gnu/javax/swing/text/html/css/Selector.h
index 1f7103e976e..ba2ba7b5d95 100644
--- a/libjava/gnu/javax/swing/text/html/css/Selector.h
+++ b/libjava/gnu/javax/swing/text/html/css/Selector.h
@@ -37,7 +37,7 @@ class gnu::javax::swing::text::html::css::Selector : public ::java::lang::Object
 
 public:
   Selector(::java::lang::String *);
-  virtual jboolean matches(JArray< ::java::lang::String * > *, JArray< ::java::util::Map * > *);
+  virtual jboolean matches(JArray< ::java::lang::String * > *, ::java::util::List *);
   virtual jint getSpecificity();
   virtual ::java::lang::String * toString();
 private:
diff --git a/libjava/gnu/xml/stream/FilteredStreamReader.h b/libjava/gnu/xml/stream/FilteredStreamReader.h
index 77c92e8598e..c762fb38b03 100644
--- a/libjava/gnu/xml/stream/FilteredStreamReader.h
+++ b/libjava/gnu/xml/stream/FilteredStreamReader.h
@@ -6,7 +6,7 @@
 
 #pragma interface
 
-#include <javax/xml/stream/util/ReaderDelegate.h>
+#include <javax/xml/stream/util/StreamReaderDelegate.h>
 extern "Java"
 {
   namespace gnu
@@ -32,7 +32,7 @@ extern "Java"
   }
 }
 
-class gnu::xml::stream::FilteredStreamReader : public ::javax::xml::stream::util::ReaderDelegate
+class gnu::xml::stream::FilteredStreamReader : public ::javax::xml::stream::util::StreamReaderDelegate
 {
 
 public: // actually package-private
@@ -42,7 +42,7 @@ public:
   virtual jint next();
   virtual jint nextTag();
 public: // actually package-private
-  ::javax::xml::stream::XMLStreamReader * __attribute__((aligned(__alignof__( ::javax::xml::stream::util::ReaderDelegate)))) reader;
+  ::javax::xml::stream::XMLStreamReader * __attribute__((aligned(__alignof__( ::javax::xml::stream::util::StreamReaderDelegate)))) reader;
   ::javax::xml::stream::StreamFilter * filter;
 public:
   static ::java::lang::Class class$;
diff --git a/libjava/gnu/xml/stream/NamespaceImpl.h b/libjava/gnu/xml/stream/NamespaceImpl.h
index 136154c99a5..a90777aeebe 100644
--- a/libjava/gnu/xml/stream/NamespaceImpl.h
+++ b/libjava/gnu/xml/stream/NamespaceImpl.h
@@ -23,6 +23,10 @@ extern "Java"
   {
     namespace xml
     {
+      namespace namespace$
+      {
+          class QName;
+      }
       namespace stream
       {
           class Location;
@@ -35,16 +39,21 @@ class gnu::xml::stream::NamespaceImpl : public ::gnu::xml::stream::XMLEventImpl
 {
 
 public: // actually protected
-  NamespaceImpl(::javax::xml::stream::Location *, ::java::lang::String *, ::java::lang::String *);
+  NamespaceImpl(::javax::xml::stream::Location *, ::java::lang::String *, ::java::lang::String *, jboolean);
 public:
   virtual jint getEventType();
   virtual ::java::lang::String * getPrefix();
   virtual ::java::lang::String * getNamespaceURI();
+  virtual jboolean isSpecified();
+  virtual ::javax::xml::namespace$::QName * getName();
+  virtual ::java::lang::String * getDTDType();
+  virtual ::java::lang::String * getValue();
   virtual jboolean isDefaultNamespaceDeclaration();
   virtual void writeAsEncodedUnicode(::java::io::Writer *);
 public: // actually protected
   ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::xml::stream::XMLEventImpl)))) prefix;
   ::java::lang::String * uri;
+  jboolean specified;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/gnu/xml/stream/XIncludeFilter.h b/libjava/gnu/xml/stream/XIncludeFilter.h
index 794eaa71c47..e920ac69553 100644
--- a/libjava/gnu/xml/stream/XIncludeFilter.h
+++ b/libjava/gnu/xml/stream/XIncludeFilter.h
@@ -6,7 +6,7 @@
 
 #pragma interface
 
-#include <javax/xml/stream/util/ReaderDelegate.h>
+#include <javax/xml/stream/util/StreamReaderDelegate.h>
 #include <gcj/array.h>
 
 extern "Java"
@@ -69,7 +69,7 @@ extern "Java"
   }
 }
 
-class gnu::xml::stream::XIncludeFilter : public ::javax::xml::stream::util::ReaderDelegate
+class gnu::xml::stream::XIncludeFilter : public ::javax::xml::stream::util::StreamReaderDelegate
 {
 
 public: // actually package-private
@@ -111,7 +111,7 @@ public: // actually package-private
   static ::java::lang::String * getParameter(::java::lang::String *, ::java::lang::String *);
   static ::java::lang::String * XINCLUDE_NS_URI;
   static const jint SHOW_FLAGS = 221;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::xml::stream::util::ReaderDelegate)))) systemId;
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::xml::stream::util::StreamReaderDelegate)))) systemId;
   jboolean namespaceAware;
   jboolean validating;
   jboolean expandERefs;
diff --git a/libjava/gnu/xml/stream/XMLStreamWriterImpl.h b/libjava/gnu/xml/stream/XMLStreamWriterImpl.h
index d2059574347..245332ed0e7 100644
--- a/libjava/gnu/xml/stream/XMLStreamWriterImpl.h
+++ b/libjava/gnu/xml/stream/XMLStreamWriterImpl.h
@@ -96,6 +96,7 @@ private:
   void writeEncoded(::java::lang::String *, jboolean);
   void writeEncodedWithRestrictedChars(::java::lang::String *, jboolean);
   jboolean isName(::java::lang::String *);
+  jboolean isPrefix(::java::lang::String *);
   jboolean isNCName(::java::lang::String *);
   jboolean isChars(::java::lang::String *);
   jboolean isURI(::java::lang::String *);