From 64089cc9f030d8ef7972adb5d117e0b23f47d62b Mon Sep 17 00:00:00 2001
From: mark <mark@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 18 May 2006 17:29:21 +0000
Subject:        Imported GNU Classpath 0.90        * scripts/makemake.tcl:
 LocaleData.java moved to gnu/java/locale.

       * sources.am: Regenerated.
       * gcj/javaprims.h: Regenerated.
       * Makefile.in: Regenerated.
       * gcj/Makefile.in: Regenerated.
       * include/Makefile.in: Regenerated.
       * testsuite/Makefile.in: Regenerated.

       * gnu/java/lang/VMInstrumentationImpl.java: New override.
       * gnu/java/net/local/LocalSocketImpl.java: Likewise.
       * gnu/classpath/jdwp/VMMethod.java: Likewise.
       * gnu/classpath/jdwp/VMVirtualMachine.java: Update to latest
       interface.
       * java/lang/Thread.java: Add UncaughtExceptionHandler.
       * java/lang/reflect/Method.java: Implements GenericDeclaration and
       isSynthetic(),
       * java/lang/reflect/Field.java: Likewise.
       * java/lang/reflect/Constructor.java
       * java/lang/Class.java: Implements Type, GenericDeclaration,
       getSimpleName() and getEnclosing*() methods.
       * java/lang/Class.h: Add new public methods.
       * java/lang/Math.java: Add signum(), ulp() and log10().
       * java/lang/natMath.cc (log10): New function.
       * java/security/VMSecureRandom.java: New override.
       * java/util/logging/Logger.java: Updated to latest classpath
       version.
       * java/util/logging/LogManager.java: New override.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@113887 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/classpath/gnu/xml/dom/DomDocument.java | 38 +++++++++++++++-----------
 1 file changed, 22 insertions(+), 16 deletions(-)

(limited to 'libjava/classpath/gnu/xml/dom/DomDocument.java')

diff --git a/libjava/classpath/gnu/xml/dom/DomDocument.java b/libjava/classpath/gnu/xml/dom/DomDocument.java
index 900d03ac3dc..5d06a428be4 100644
--- a/libjava/classpath/gnu/xml/dom/DomDocument.java
+++ b/libjava/classpath/gnu/xml/dom/DomDocument.java
@@ -149,6 +149,14 @@ public class DomDocument
     checkingWellformedness = flag;
   }
 
+  /**
+   * Sets whether to check for document characters.
+   */
+  public void setCheckingCharacters(boolean flag)
+  {
+    checkingCharacters = flag;
+  }  
+  
   /**
    * <b>DOM L1</b>
    * Returns the constant "#document".
@@ -235,6 +243,18 @@ public class DomDocument
         if (current.getNodeType() == ELEMENT_NODE)
           {
             DomElement element = (DomElement) current;
+            if (element.userIdAttrs != null)
+              {
+                for (Iterator i = element.userIdAttrs.iterator();
+                     i.hasNext(); )
+                  {
+                    Node idAttr = (Node) i.next();
+                    if (id.equals(idAttr.getNodeValue()))
+                      {
+                        return element;
+                      }
+                  }
+              }
             if (doctype != null)
               {
                 DTDElementTypeInfo info =
@@ -244,18 +264,6 @@ public class DomDocument
                   {
                     return element;
                   }
-                else if (element.userIdAttrs != null)
-                  {
-                    for (Iterator i = element.userIdAttrs.iterator();
-                         i.hasNext(); )
-                      {
-                        Node idAttr = (Node) i.next();
-                        if (id.equals(idAttr.getNodeValue()))
-                          {
-                            return element;
-                          }
-                      }
-                  }
               }
             // xml:id
             String xmlId = element.getAttribute("xml:id");
@@ -535,11 +543,9 @@ public class DomDocument
     int index = name.indexOf(':');
     if (index != -1)
       {
-        if (index == 0 || index == (len - 1) ||
-            name.lastIndexOf(':') != index)
+        if (index == 0 || index == (len - 1) || name.lastIndexOf(':') != index)
           {
-            throw new DomDOMException(DOMException.NAMESPACE_ERR,
-                                      name, null, 0);
+            throw new DomDOMException(DOMException.NAMESPACE_ERR, name, null, 0);
           }
       }
   }
-- 
cgit v1.2.3