13 files changed, 67 insertions, 11 deletions
diff --git a/libjava/gnu/xml/dom/DomAttr.h b/libjava/gnu/xml/dom/DomAttr.h
index e14ac0f9529..db0e57d92db 100644
--- a/libjava/gnu/xml/dom/DomAttr.h
+++ b/libjava/gnu/xml/dom/DomAttr.h
@@ -39,6 +39,7 @@ class gnu::xml::dom::DomAttr : public ::gnu::xml::dom::DomNsNode
 
 public: // actually protected
   DomAttr(::gnu::xml::dom::DomDocument *, ::java::lang::String *, ::java::lang::String *);
+  DomAttr(::gnu::xml::dom::DomDocument *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
 public:
   virtual ::java::lang::String * getName();
   virtual jboolean getSpecified();
diff --git a/libjava/gnu/xml/dom/DomElement.h b/libjava/gnu/xml/dom/DomElement.h
index 35ed33eaaa6..32698e51bbf 100644
--- a/libjava/gnu/xml/dom/DomElement.h
+++ b/libjava/gnu/xml/dom/DomElement.h
@@ -41,6 +41,7 @@ class gnu::xml::dom::DomElement : public ::gnu::xml::dom::DomNsNode
 
 public: // actually protected
   DomElement(::gnu::xml::dom::DomDocument *, ::java::lang::String *, ::java::lang::String *);
+  DomElement(::gnu::xml::dom::DomDocument *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
 public:
   virtual ::org::w3c::dom::NamedNodeMap * getAttributes();
   virtual jboolean hasAttributes();
diff --git a/libjava/gnu/xml/dom/DomNsNode.h b/libjava/gnu/xml/dom/DomNsNode.h
index 13dc4940fc5..bd75d27d578 100644
--- a/libjava/gnu/xml/dom/DomNsNode.h
+++ b/libjava/gnu/xml/dom/DomNsNode.h
@@ -27,6 +27,7 @@ class gnu::xml::dom::DomNsNode : public ::gnu::xml::dom::DomNode
 
 public: // actually package-private
   DomNsNode(jshort, ::gnu::xml::dom::DomDocument *, ::java::lang::String *, ::java::lang::String *);
+  DomNsNode(jshort, ::gnu::xml::dom::DomDocument *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
 public:
   virtual ::java::lang::String * getNodeName();
 public: // actually package-private
@@ -43,7 +44,6 @@ private:
   ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::xml::dom::DomNode)))) name;
   ::java::lang::String * namespace$;
   ::java::lang::String * prefix;
-public: // actually package-private
   ::java::lang::String * localName;
 public:
   static ::java::lang::Class class$;
diff --git a/libjava/gnu/xml/dom/ls/SAXEventSink.h b/libjava/gnu/xml/dom/ls/SAXEventSink.h
index 54f4e5f1596..fc726b78800 100644
--- a/libjava/gnu/xml/dom/ls/SAXEventSink.h
+++ b/libjava/gnu/xml/dom/ls/SAXEventSink.h
@@ -61,6 +61,7 @@ public:
   virtual ::org::w3c::dom::Document * getDocument();
   virtual void setReader(::org::xml::sax::XMLReader *);
   virtual void setDocumentLocator(::org::xml::sax::Locator *);
+  virtual void setNamespaceAware(jboolean);
   virtual void startDocument();
   virtual void endDocument();
   virtual void startPrefixMapping(::java::lang::String *, ::java::lang::String *);
@@ -104,8 +105,8 @@ private:
   static ::java::lang::String * XMLNS_URI;
   static ::java::lang::String * XMLNS_PREFIX;
   static ::java::util::HashSet * PREDEFINED_ENTITIES;
-public: // actually package-private
   jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) namespaceAware;
+public: // actually package-private
   jboolean ignoreWhitespace;
   jboolean expandEntityReferences;
   jboolean ignoreComments;
diff --git a/libjava/gnu/xml/stream/XMLParser.h b/libjava/gnu/xml/stream/XMLParser.h
index 3136a60e591..0fb26669387 100644
--- a/libjava/gnu/xml/stream/XMLParser.h
+++ b/libjava/gnu/xml/stream/XMLParser.h
@@ -13,6 +13,13 @@ extern "Java"
 {
   namespace gnu
   {
+    namespace java
+    {
+      namespace lang
+      {
+          class CPStringBuilder;
+      }
+    }
     namespace xml
     {
       namespace stream
@@ -145,13 +152,13 @@ private:
   void readMarkupdecl(jboolean);
   void readElementDecl();
   void readContentspec(::java::lang::String *);
-  ::gnu::xml::stream::XMLParser$ElementContentModel * readElements(::java::lang::StringBuffer *);
-  ::gnu::xml::stream::XMLParser$ContentParticle * readContentParticle(::java::lang::StringBuffer *);
+  ::gnu::xml::stream::XMLParser$ElementContentModel * readElements(::gnu::java::lang::CPStringBuilder *);
+  ::gnu::xml::stream::XMLParser$ContentParticle * readContentParticle(::gnu::java::lang::CPStringBuilder *);
   void readAttlistDecl();
   void readAttDef(::java::lang::String *);
-  ::java::lang::String * readAttType(::java::lang::StringBuffer *, ::java::util::HashSet *);
-  void readEnumeration(jboolean, ::java::lang::StringBuffer *, ::java::util::HashSet *);
-  void readNotationType(::java::lang::StringBuffer *, ::java::util::HashSet *);
+  ::java::lang::String * readAttType(::gnu::java::lang::CPStringBuilder *, ::java::util::HashSet *);
+  void readEnumeration(jboolean, ::gnu::java::lang::CPStringBuilder *, ::java::util::HashSet *);
+  void readNotationType(::gnu::java::lang::CPStringBuilder *, ::java::util::HashSet *);
   void readDefault(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::HashSet *);
   void readEntityDecl(jboolean);
   void readNotationDecl(jboolean);
diff --git a/libjava/gnu/xml/transform/AbstractNumberNode.h b/libjava/gnu/xml/transform/AbstractNumberNode.h
index d8c2740809d..20dadf66a6a 100644
--- a/libjava/gnu/xml/transform/AbstractNumberNode.h
+++ b/libjava/gnu/xml/transform/AbstractNumberNode.h
@@ -13,6 +13,13 @@ extern "Java"
 {
   namespace gnu
   {
+    namespace java
+    {
+      namespace lang
+      {
+          class CPStringBuilder;
+      }
+    }
     namespace xml
     {
       namespace transform
@@ -52,7 +59,7 @@ public: // actually package-private
   AbstractNumberNode(::gnu::xml::transform::TemplateNode *, ::java::lang::String *, jint, ::java::lang::String *, jint);
   virtual void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
   virtual ::java::lang::String * format(::java::lang::String *, JArray< jint > *);
-  virtual void format(::java::lang::StringBuffer *, jint, ::java::lang::String *);
+  virtual void format(::gnu::java::lang::CPStringBuilder *, jint, ::java::lang::String *);
   static jboolean isAlphanumeric(jchar);
   static ::java::lang::String * alphabetic(jchar, jint);
   static ::java::lang::String * roman(jboolean, jint);
diff --git a/libjava/gnu/xml/transform/ParameterNode.h b/libjava/gnu/xml/transform/ParameterNode.h
index 6a815cfafd8..aebd3e05054 100644
--- a/libjava/gnu/xml/transform/ParameterNode.h
+++ b/libjava/gnu/xml/transform/ParameterNode.h
@@ -52,14 +52,18 @@ class gnu::xml::transform::ParameterNode : public ::gnu::xml::transform::Templat
 
 public: // actually package-private
   ParameterNode(::javax::xml::namespace::QName *, ::gnu::xml::xpath::Expr *, jint);
-  ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
+  ::gnu::xml::transform::ParameterNode * ParameterNode$clone(::gnu::xml::transform::Stylesheet *);
   void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
   ::java::lang::Object * getValue(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint);
 public:
   jboolean references(::javax::xml::namespace::QName *);
-  jint compareTo(::java::lang::Object *);
+  jint ParameterNode$compareTo(::gnu::xml::transform::ParameterNode *);
   ::java::lang::String * toString();
 public: // actually package-private
+  ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
+public:
+  jint compareTo(::java::lang::Object *);
+public: // actually package-private
   ::javax::xml::namespace::QName * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) name;
   ::gnu::xml::xpath::Expr * select;
   jint type;
diff --git a/libjava/gnu/xml/transform/SortKey.h b/libjava/gnu/xml/transform/SortKey.h
index f433dc39668..b35aa5b12c9 100644
--- a/libjava/gnu/xml/transform/SortKey.h
+++ b/libjava/gnu/xml/transform/SortKey.h
@@ -55,6 +55,10 @@ public: // actually package-private
   ::java::lang::String * key(::org::w3c::dom::Node *);
   void init(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
   jboolean references(::javax::xml::namespace::QName *);
+  ::gnu::xml::transform::SortKey * clone(::gnu::xml::transform::Stylesheet *);
+private:
+  ::gnu::xml::transform::TemplateNode * cloneAttributeValueTemplate(::gnu::xml::transform::TemplateNode *, ::gnu::xml::transform::Stylesheet *);
+public: // actually package-private
   static const jint DEFAULT = 0;
   static const jint UPPER_FIRST = 1;
   static const jint LOWER_FIRST = 2;
diff --git a/libjava/gnu/xml/transform/Stylesheet.h b/libjava/gnu/xml/transform/Stylesheet.h
index c2a3f20d6db..8bfebcc05c9 100644
--- a/libjava/gnu/xml/transform/Stylesheet.h
+++ b/libjava/gnu/xml/transform/Stylesheet.h
@@ -120,6 +120,7 @@ public: // actually package-private
   static ::java::lang::String * getRequiredAttribute(::org::w3c::dom::NamedNodeMap *, ::java::lang::String *, ::org::w3c::dom::Node *);
 public:
   virtual void handle(jshort, ::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
+  virtual ::java::lang::String * toString();
 public: // actually package-private
   static ::java::lang::String * XSL_NS;
 private:
diff --git a/libjava/gnu/xml/transform/TemplatesImpl.h b/libjava/gnu/xml/transform/TemplatesImpl.h
index d79409b3df8..d9cc67bb5be 100644
--- a/libjava/gnu/xml/transform/TemplatesImpl.h
+++ b/libjava/gnu/xml/transform/TemplatesImpl.h
@@ -41,6 +41,7 @@ public: // actually package-private
 public:
   virtual ::javax::xml::transform::Transformer * newTransformer();
   virtual ::java::util::Properties * getOutputProperties();
+  virtual ::java::lang::String * toString();
 public: // actually package-private
   ::gnu::xml::transform::TransformerFactoryImpl * __attribute__((aligned(__alignof__( ::java::lang::Object)))) factory;
   ::gnu::xml::transform::Stylesheet * stylesheet;
diff --git a/libjava/gnu/xml/transform/XSLComparator.h b/libjava/gnu/xml/transform/XSLComparator.h
index 0f99c57c86d..0bde3e80a4b 100644
--- a/libjava/gnu/xml/transform/XSLComparator.h
+++ b/libjava/gnu/xml/transform/XSLComparator.h
@@ -19,6 +19,16 @@ extern "Java"
       }
     }
   }
+  namespace org
+  {
+    namespace w3c
+    {
+      namespace dom
+      {
+          class Node;
+      }
+    }
+  }
 }
 
 class gnu::xml::transform::XSLComparator : public ::java::lang::Object
@@ -27,6 +37,7 @@ class gnu::xml::transform::XSLComparator : public ::java::lang::Object
 public: // actually package-private
   XSLComparator(::java::util::List *);
 public:
+  virtual jint XSLComparator$compare(::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
   virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
 public: // actually package-private
   ::java::util::List * __attribute__((aligned(__alignof__( ::java::lang::Object)))) sortKeys;
diff --git a/libjava/gnu/xml/util/XMLWriter.h b/libjava/gnu/xml/util/XMLWriter.h
index ea354b999f3..56252a5c199 100644
--- a/libjava/gnu/xml/util/XMLWriter.h
+++ b/libjava/gnu/xml/util/XMLWriter.h
@@ -13,6 +13,13 @@ extern "Java"
 {
   namespace gnu
   {
+    namespace java
+    {
+      namespace lang
+      {
+          class CPStringBuilder;
+      }
+    }
     namespace xml
     {
       namespace util
@@ -118,7 +125,7 @@ private:
   jint elementNestLevel;
   ::java::lang::String * eol;
   jshort dangerMask;
-  ::java::lang::StringBuffer * stringBuf;
+  ::gnu::java::lang::CPStringBuilder * stringBuf;
   ::org::xml::sax::Locator * locator;
   ::org::xml::sax::ErrorHandler * errHandler;
   jboolean expandingEntities;
diff --git a/libjava/gnu/xml/xpath/DocumentOrderComparator.h b/libjava/gnu/xml/xpath/DocumentOrderComparator.h
index f34cb311a47..26abc2cff3e 100644
--- a/libjava/gnu/xml/xpath/DocumentOrderComparator.h
+++ b/libjava/gnu/xml/xpath/DocumentOrderComparator.h
@@ -19,6 +19,16 @@ extern "Java"
       }
     }
   }
+  namespace org
+  {
+    namespace w3c
+    {
+      namespace dom
+      {
+          class Node;
+      }
+    }
+  }
 }
 
 class gnu::xml::xpath::DocumentOrderComparator : public ::java::lang::Object
@@ -26,6 +36,7 @@ class gnu::xml::xpath::DocumentOrderComparator : public ::java::lang::Object
 
 public:
   DocumentOrderComparator();
+  virtual jint DocumentOrderComparator$compare(::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
   virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
   static ::java::lang::Class class$;
 };