You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by le...@locus.apache.org on 2000/01/21 03:17:53 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/dom AttrNSImpl.java
lehors 00/01/20 18:17:53
Modified: java/src/org/apache/xerces/dom AttrNSImpl.java
Log:
implemented latest change from DOM Level 2 spec
Revision Changes Path
1.4 +16 -27 xml-xerces/java/src/org/apache/xerces/dom/AttrNSImpl.java
Index: AttrNSImpl.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/dom/AttrNSImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AttrNSImpl.java 2000/01/20 20:50:53 1.3
+++ AttrNSImpl.java 2000/01/21 02:17:53 1.4
@@ -1,4 +1,4 @@
-/* $Id: AttrNSImpl.java,v 1.3 2000/01/20 20:50:53 lehors Exp $ */
+/* $Id: AttrNSImpl.java,v 1.4 2000/01/21 02:17:53 lehors Exp $ */
/*
* The Apache Software License, Version 1.1
*
@@ -117,34 +117,23 @@
"INVALID_CHARACTER_ERR");
}
- if (prefix != null && prefix.equals("xml")) {
-
- if (namespaceURI != null && !namespaceURI.equals("")
- && !namespaceURI.equals("http://www.w3.org/XML/1998/namespace"))
- {
- throw new DOMExceptionImpl(DOMException.NAMESPACE_ERR,
- "NAMESPACE_ERR");
- }
- }
- else if (prefix != null && prefix.equals("xmlns")) {
- if (namespaceURI != null && !namespaceURI.equals("") )
- {
- throw new DOMExceptionImpl(DOMException.NAMESPACE_ERR,
- "NAMESPACE_ERR");
- }
- }
- else if (prefix != null && (namespaceURI == null || namespaceURI.equals("")) )
- {
- throw new DOMExceptionImpl(DOMException.NAMESPACE_ERR,
- "NAMESPACE_ERR");
- }
-
- // Unqualified attributes do not have namespaces as per NS spec.
- if (prefix == null)
- namespaceURI = null;
+ if (namespaceURI == null || namespaceURI.equals("")) {
+ if (prefix != null && prefix.equals("xml")) {
+ namespaceURI = "http://www.w3.org/XML/1998/namespace";
+ } else if (qualifiedName.equals("xmlns")) {
+ namespaceURI = "http://www.w3.org/2000/xmlns/";
+ }
+ } else {
+ if (prefix != null &&
+ ((prefix.equals("xml")
+ && !namespaceURI.equals("http://www.w3.org/XML/1998/namespace"))
+ || prefix.equals("xmlns"))) {
+ throw new DOMExceptionImpl(DOMException.NAMESPACE_ERR,
+ "NAMESPACE_ERR");
+ }
+ }
syncData = true;
-
}
// for DeferredAttrImpl