You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2015/07/19 15:10:35 UTC

svn commit: r1691824 - in /webservices/axiom: experimental/dom/src/main/java/org/apache/axiom/dom/impl/ trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/ trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ trunk/impl...

Author: veithen
Date: Sun Jul 19 13:10:34 2015
New Revision: 1691824

URL: http://svn.apache.org/r1691824
Log:
Implement the isDefaultNamespace method.

Modified:
    webservices/axiom/experimental/dom/src/main/java/org/apache/axiom/dom/impl/NodeImpl.java
    webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMNodeSupport.aj
    webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java
    webservices/axiom/trunk/implementations/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/DOMImplementationTest.java

Modified: webservices/axiom/experimental/dom/src/main/java/org/apache/axiom/dom/impl/NodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/experimental/dom/src/main/java/org/apache/axiom/dom/impl/NodeImpl.java?rev=1691824&r1=1691823&r2=1691824&view=diff
==============================================================================
--- webservices/axiom/experimental/dom/src/main/java/org/apache/axiom/dom/impl/NodeImpl.java (original)
+++ webservices/axiom/experimental/dom/src/main/java/org/apache/axiom/dom/impl/NodeImpl.java Sun Jul 19 13:10:34 2015
@@ -64,11 +64,6 @@ abstract class NodeImpl implements DOMNo
         throw new UnsupportedOperationException();
     }
 
-    public final boolean isDefaultNamespace(String namespaceURI) {
-        // TODO
-        throw new UnsupportedOperationException();
-    }
-
     public final Object getFeature(String feature, String version) {
         // TODO
         throw new UnsupportedOperationException();

Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMNodeSupport.aj?rev=1691824&r1=1691823&r2=1691824&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMNodeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMNodeSupport.aj Sun Jul 19 13:10:34 2015
@@ -52,4 +52,15 @@ public aspect DOMNodeSupport {
             return prefix == null || prefix.length() == 0 ? null : prefix;
         }
     }
+
+    public final boolean DOMNode.isDefaultNamespace(String namespaceURI) {
+        CoreElement context = getNamespaceContext();
+        if (context == null) {
+            return false;
+        }
+        if (namespaceURI == null) {
+            namespaceURI = "";
+        }
+        return namespaceURI.equals(context.coreLookupNamespaceURI("", false));
+    }
 }

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=1691824&r1=1691823&r2=1691824&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 Sun Jul 19 13:10:34 2015
@@ -93,11 +93,6 @@ public abstract class NodeImpl implement
         return this == node;
     }
 
-    public boolean isDefaultNamespace(String namespaceURI) {
-        // TODO TODO
-        throw new UnsupportedOperationException("TODO");
-    }
-
     /**
      * Tests whether two nodes are equal. <br>This method tests for equality of nodes, not sameness
      * (i.e., whether the two nodes are references to the same object) which can be tested with

Modified: webservices/axiom/trunk/implementations/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/DOMImplementationTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/DOMImplementationTest.java?rev=1691824&r1=1691823&r2=1691824&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/DOMImplementationTest.java (original)
+++ webservices/axiom/trunk/implementations/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/DOMImplementationTest.java Sun Jul 19 13:10:34 2015
@@ -333,20 +333,6 @@ public class DOMImplementationTest exten
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeinsertbefore14)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeinsertbefore17)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeinsertbefore25)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeisdefaultnamespace01)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeisdefaultnamespace02)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeisdefaultnamespace03)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeisdefaultnamespace05)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeisdefaultnamespace06)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeisdefaultnamespace07)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeisdefaultnamespace08)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeisdefaultnamespace09)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeisdefaultnamespace10)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeisdefaultnamespace11)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeisdefaultnamespace13)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeisdefaultnamespace14)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeisdefaultnamespace15)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeisdefaultnamespace16)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeisequalnode05)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeisequalnode10)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeisequalnode11)");