summaryrefslogtreecommitdiff
path: root/libjava/classpath/gnu/xml/dom/DomDocument.java
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/classpath/gnu/xml/dom/DomDocument.java')
-rw-r--r--libjava/classpath/gnu/xml/dom/DomDocument.java38
1 files changed, 22 insertions, 16 deletions
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
@@ -150,6 +150,14 @@ public class DomDocument
}
/**
+ * 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);
}
}
}