Merged gcj-eclipse branch to trunk.

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

3 files changed, 10 insertions, 3 deletions

diff --git a/libjava/classpath/gnu/xml/dom/DomAttr.java b/libjava/classpath/gnu/xml/dom/DomAttr.java
index 8673a796161..31d7af2d2f1 100644
--- a/libjava/classpath/gnu/xml/dom/DomAttr.java
+++ b/libjava/classpath/gnu/xml/dom/DomAttr.java
@@ -316,7 +316,7 @@ public class DomAttr
     
   private void mutating(String oldValue, String newValue, short why)
   {
-    if (!reportMutations || parent == null)
+    if (!reportMutations || parent == null || equal(newValue, oldValue))
       {
         return;
       }
diff --git a/libjava/classpath/gnu/xml/dom/DomNode.java b/libjava/classpath/gnu/xml/dom/DomNode.java
index f0915eb5e93..9af3f3e5498 100644
--- a/libjava/classpath/gnu/xml/dom/DomNode.java
+++ b/libjava/classpath/gnu/xml/dom/DomNode.java
@@ -668,6 +668,7 @@ public abstract class DomNode
               {
                 insertionEvent(null, child);
               }
+            length++;
           }
         
         return child;
@@ -1561,7 +1562,7 @@ public abstract class DomNode
         // Climb to the top of this subtree and handle capture, letting
         // each node (from the top down) capture until one stops it or
         // until we get to this one.
-        current = parent;
+        current = (parent == null) ? this : parent;
         if (current.depth >= ANCESTORS_INIT)
           {
             DomNode[] newants = new DomNode[current.depth + 1];
diff --git a/libjava/classpath/gnu/xml/dom/ls/SAXEventSink.java b/libjava/classpath/gnu/xml/dom/ls/SAXEventSink.java
index aad5ac76e70..8c5b104b9f2 100644
--- a/libjava/classpath/gnu/xml/dom/ls/SAXEventSink.java
+++ b/libjava/classpath/gnu/xml/dom/ls/SAXEventSink.java
@@ -43,6 +43,7 @@ import java.util.LinkedList;
 import java.util.List;
 import javax.xml.XMLConstants;
 import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
 import org.w3c.dom.DocumentType;
 import org.w3c.dom.Element;
 import org.w3c.dom.Entity;
@@ -72,7 +73,7 @@ import gnu.xml.dom.DomNode;
  *
  * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
  */
-class SAXEventSink
+public class SAXEventSink
   implements ContentHandler, LexicalHandler, DTDHandler, DeclHandler
 {
 
@@ -110,6 +111,11 @@ class SAXEventSink
     interrupted = true;
   }
 
+  protected Document getDocument()
+  {
+    return doc;
+  }
+
   // -- ContentHandler2 --
   
   public void setDocumentLocator(Locator locator)