Author: veithen
Date: Thu Jun 11 21:59:35 2015
New Revision: 1684979
URL: http://svn.apache.org/r1684979
Log:
Unify the getNamespaceURI() implementations.
Modified:
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragmentSupport.aj
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomNamedInformationItemSupport.aj
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ChildNode.java
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMAttributeImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
Modified:
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragmentSupport.aj
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragmentSupport.aj?rev=1684979&r1=1684978&r2=1684979&view=diff
==============================================================================
---
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragmentSupport.aj
(original)
+++
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragmentSupport.aj
Thu Jun 11 21:59:35 2015
@@ -51,6 +51,10 @@ public aspect DOMDocumentFragmentSupport
return null;
}
+ public final String DOMDocumentFragment.getNamespaceURI() {
+ return null;
+ }
+
public final void DOMDocumentFragment.setPrefix(String prefix) throws
DOMException {
throw newDOMException(DOMException.NAMESPACE_ERR);
}
Modified:
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentSupport.aj
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentSupport.aj?rev=1684979&r1=1684978&r2=1684979&view=diff
==============================================================================
---
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentSupport.aj
(original)
+++
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentSupport.aj
Thu Jun 11 21:59:35 2015
@@ -47,6 +47,10 @@ public aspect DOMDocumentSupport {
return null;
}
+ public final String DOMDocument.getNamespaceURI() {
+ return null;
+ }
+
public final String DOMDocument.getLocalName() {
return null;
}
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomNamedInformationItemSupport.aj
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomNamedInformationItemSupport.aj?rev=1684979&r1=1684978&r2=1684979&view=diff
==============================================================================
---
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomNamedInformationItemSupport.aj
(original)
+++
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomNamedInformationItemSupport.aj
Thu Jun 11 21:59:35 2015
@@ -75,6 +75,16 @@ public aspect AxiomNamedInformationItemS
}
}
+ public final String AxiomNamedInformationItem.getNamespaceURI() {
+ OMNamespace namespace = getNamespace();
+ if (namespace == null) {
+ return null;
+ } else {
+ String namespaceURI = namespace.getNamespaceURI();
+ return namespaceURI.length() == 0 ? null : namespaceURI;
+ }
+ }
+
public String AxiomNamedInformationItem.getLocalName() {
return localName;
}
Modified:
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java?rev=1684979&r1=1684978&r2=1684979&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java
Thu Jun 11 21:59:35 2015
@@ -272,21 +272,6 @@ public class AttrImpl extends RootNode i
setTextContent(value);
}
- /**
- * Returns the namespace URI of this attr node.
- *
- * @see org.w3c.dom.Node#getNamespaceURI()
- */
- public String getNamespaceURI() {
- OMNamespace namespace = getNamespace();
- if (namespace == null) {
- return null;
- } else {
- String namespaceURI = namespace.getNamespaceURI();
- return namespaceURI.length() == 0 ? null : namespaceURI;
- }
- }
-
/*
* DOM-Level 3 methods
*/
Modified:
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ChildNode.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ChildNode.java?rev=1684979&r1=1684978&r2=1684979&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ChildNode.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ChildNode.java
Thu Jun 11 21:59:35 2015
@@ -88,6 +88,10 @@ public abstract class ChildNode extends
return null;
}
+ public final String getNamespaceURI() {
+ return null;
+ }
+
public final void setPrefix(String prefix) throws DOMException {
throw newDOMException(DOMException.NAMESPACE_ERR);
}
Modified:
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java?rev=1684979&r1=1684978&r2=1684979&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
Thu Jun 11 21:59:35 2015
@@ -103,19 +103,6 @@ public class ElementImpl extends ParentN
}
}
- /** Returns the value of the namespace URI. */
- public String getNamespaceURI() {
- OMNamespace namespace = getNamespace();
- if (namespace == null) {
- return null;
- } else {
- // If the element has no namespace, the result should be null, not
- // an empty string.
- String uri = namespace.getNamespaceURI();
- return uri.length() == 0 ? null : uri.intern();
- }
- }
-
// /
// / org.w3c.dom.Element methods
// /
Modified:
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java?rev=1684979&r1=1684978&r2=1684979&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java
Thu Jun 11 21:59:35 2015
@@ -61,10 +61,6 @@ public abstract class NodeImpl extends I
return false; // overridden in ElementImpl
}
- public String getNamespaceURI() {
- return null; // Override in AttrImpl and ElementImpl
- }
-
/**
* Returns the collection of attributes associated with this node, or null
if none. At this
* writing, Element is the only type of node which will ever have
attributes.
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMAttributeImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMAttributeImpl.java?rev=1684979&r1=1684978&r2=1684979&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMAttributeImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMAttributeImpl.java
Thu Jun 11 21:59:35 2015
@@ -95,16 +95,6 @@ public class OMAttributeImpl extends OMI
this.type = type;
}
- public String getNamespaceURI() {
- OMNamespace ns = getNamespace();
- if (ns == null) {
- return null;
- } else {
- String namespaceURI = ns.getNamespaceURI();
- return namespaceURI.length() == 0 ? null : namespaceURI;
- }
- }
-
public OMFactory getOMFactory() {
return this.factory;
}
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java?rev=1684979&r1=1684978&r2=1684979&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
Thu Jun 11 21:59:35 2015
@@ -489,16 +489,6 @@ public class OMElementImpl extends OMNod
////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////
- public String getNamespaceURI() {
- OMNamespace ns = getNamespace();
- if (ns == null) {
- return null;
- } else {
- String namespaceURI = ns.getNamespaceURI();
- return namespaceURI.length() == 0 ? null : namespaceURI;
- }
- }
-
public void setNamespace(OMNamespace namespace) {
setNamespace(namespace, true);
}
