svn commit: r1685146 - in /webservices/axiom/trunk: aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElementSupport.aj implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java

[ve...@apache.org]

Author: veithen
Date: Fri Jun 12 18:43:45 2015
New Revision: 1685146

URL: http://svn.apache.org/r1685146
Log:
Simplify and move some Element methods to the DOMElementSupport aspect.

Modified:
    webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElementSupport.aj
    webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java

Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElementSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElementSupport.aj?rev=1685146&r1=1685145&r2=1685146&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElementSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElementSupport.aj Fri Jun 12 18:43:45 2015
@@ -20,6 +20,7 @@ package org.apache.axiom.dom;
 
 import javax.xml.XMLConstants;
 
+import org.w3c.dom.Attr;
 import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -116,4 +117,22 @@ public aspect DOMElementSupport {
         DOMParentNode parent = (DOMParentNode)coreGetParent();
         return parent instanceof Element ? ((DOMElement)parent).lookupPrefix(namespaceURI, originalElement) : null;
     }
+
+    public final String DOMElement.getAttribute(String name) {
+        Attr attr = getAttributeNode(name);
+        return attr != null ? attr.getValue() : "";
+    }
+
+    public final String DOMElement.getAttributeNS(String namespaceURI, String localName) {
+        Attr attr = getAttributeNodeNS(namespaceURI, localName);
+        return attr != null ? attr.getValue() : "";
+    }
+
+    public final boolean DOMElement.hasAttribute(String name) {
+        return getAttributeNode(name) != null;
+    }
+
+    public final boolean DOMElement.hasAttributeNS(String namespaceURI, String localName) {
+        return getAttributeNodeNS(namespaceURI, localName) != null;
+    }
 }

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=1685146&r1=1685145&r2=1685146&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 Fri Jun 12 18:43:45 2015
@@ -145,39 +145,6 @@ public class ElementImpl extends ParentN
         return oldAttr;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.w3c.dom.Element#hasAttribute(java.lang.String)
-     */
-    public boolean hasAttribute(String name) {
-        return this.getAttributeNode(name) != null;
-    }
-
-    /**
-     * Returns whether the given attribute is available or not.
-     *
-     * @see org.w3c.dom.Element#hasAttributeNS(String, String)
-     */
-    public boolean hasAttributeNS(String namespaceURI, String localName) {
-        return this.getAttributeNodeNS(namespaceURI, localName) != null;
-    }
-
-    /**
-     * Looks in the local list of attributes and returns if found. If the local list is null,
-     * returns "".
-     *
-     * @see org.w3c.dom.Element#getAttribute(String)
-     */
-    public String getAttribute(String name) {
-        if (attributes == null) {
-            return "";
-        } else {
-            Attr attr = ((Attr) attributes.getNamedItem(name));
-            return (attr != null) ? attr.getValue() : "";
-        }
-    }
-
     /**
      * Retrieves an attribute node by name.
      *
@@ -189,19 +156,6 @@ public class ElementImpl extends ParentN
     }
 
     /**
-     * Retrieves an attribute value by local name and namespace URI.
-     *
-     * @see org.w3c.dom.Element#getAttributeNS(String, String)
-     */
-    public String getAttributeNS(String namespaceURI, String localName) {
-        if (this.attributes == null) {
-            return "";
-        }
-        Attr attributeNodeNS = this.getAttributeNodeNS(namespaceURI, localName);
-        return attributeNodeNS == null ? "" : attributeNodeNS.getValue();
-    }
-
-    /**
      * Retrieves an attribute node by local name and namespace URI.
      *
      * @see org.w3c.dom.Element#getAttributeNodeNS(String, String)