summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Burdess <dog@bluezoo.org>2005-06-24 19:53:52 +0000
committerChris Burdess <dog@bluezoo.org>2005-06-24 19:53:52 +0000
commitff8a50c0179deb4827cccf40ca300eccab057b63 (patch)
treebfda80d737d2df45203b2c65e7ef06ad968b7a9f
parent27c9c0ceb8161249b76420fe7bbfccb8a29f1107 (diff)
downloadclasspath-ff8a50c0179deb4827cccf40ca300eccab057b63.tar.gz
2005-05-14 Chris Burdess <dog@gnu.org>
* gnu/xml/aelfred2/XmlParser.java: ensure that charset parameter of external MIME entity is trimmed. * gnu/xml/dom/DomDocument.java: DomNsNodes retrieved via createElement/createAttribute should not have localNames.
-rw-r--r--ChangeLog7
-rw-r--r--gnu/xml/aelfred2/XmlParser.java2
-rw-r--r--gnu/xml/dom/DomDocument.java8
-rw-r--r--gnu/xml/dom/DomNsNode.java2
4 files changed, 15 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 939e4888c..51b74746b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-14 Chris Burdess <dog@gnu.org>
+
+ * gnu/xml/aelfred2/XmlParser.java: ensure that charset parameter of
+ external MIME entity is trimmed.
+ * gnu/xml/dom/DomDocument.java: DomNsNodes retrieved via
+ createElement/createAttribute should not have localNames.
+
2005-06-24 Audrius Meskauskas <AudriusA@Bioinformatics.org>
org/omg/PortableServer/POAPackage/AdapterAlreadyExists.java,
diff --git a/gnu/xml/aelfred2/XmlParser.java b/gnu/xml/aelfred2/XmlParser.java
index 18a752d07..426e1dfad 100644
--- a/gnu/xml/aelfred2/XmlParser.java
+++ b/gnu/xml/aelfred2/XmlParser.java
@@ -4559,7 +4559,7 @@ loop:
encoding.substring(temp + 1,
encoding.indexOf('"', temp + 2));
}
- encoding.trim();
+ encoding = encoding.trim();
}
else
{
diff --git a/gnu/xml/dom/DomDocument.java b/gnu/xml/dom/DomDocument.java
index d8ccc9d82..b26c70cfd 100644
--- a/gnu/xml/dom/DomDocument.java
+++ b/gnu/xml/dom/DomDocument.java
@@ -581,7 +581,9 @@ public class DomDocument
}
else
{
- element = new DomElement(this, null, name);
+ DomElement domElement = new DomElement(this, null, name);
+ domElement.localName = null;
+ element = domElement;
}
defaultAttributes(element, name);
return element;
@@ -776,7 +778,9 @@ public class DomDocument
}
else
{
- return new DomAttr(this, null, name);
+ DomAttr ret = new DomAttr(this, null, name);
+ ret.localName = null;
+ return ret;
}
}
diff --git a/gnu/xml/dom/DomNsNode.java b/gnu/xml/dom/DomNsNode.java
index 15b2fb542..9e43dd45d 100644
--- a/gnu/xml/dom/DomNsNode.java
+++ b/gnu/xml/dom/DomNsNode.java
@@ -54,7 +54,7 @@ public abstract class DomNsNode
private String name;
private String namespace;
private String prefix;
- private String localName;
+ String localName;
/**
* Constructs a node associated with the specified document, and