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 2011/12/17 16:28:57 UTC
svn commit: r1215511 - in /webservices/commons/trunk/modules/axiom/modules:
axiom-api/src/main/java/org/apache/axiom/om/
axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/
axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/
axiom-testsuite...
Author: veithen
Date: Sat Dec 17 15:28:57 2011
New Revision: 1215511
URL: http://svn.apache.org/viewvc?rev=1215511&view=rev
Log:
AXIOM-398: Committed a couple of changes that were missing in r1215506.
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMElement.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetDefaultNamespace2.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1Unqualified.java
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMElement.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMElement.java?rev=1215511&r1=1215510&r2=1215511&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMElement.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMElement.java Sat Dec 17 15:28:57 2011
@@ -134,8 +134,13 @@ public interface OMElement extends OMNod
OMNamespace declareDefaultNamespace(String uri);
/**
- * This will retrieve the default namespace of this element, if available. null returned if none
- * is found.
+ * Get the default namespace in scope on this element.
+ *
+ * @return The default namespace or <code>null</code> if no default namespace is in scope. This
+ * method never returns an {@link OMNamespace} object with an empty namespace URI; if
+ * the element or one of its ancestors has a <tt>xmlns=""</tt> declaration, then
+ * <code>null</code> is returned. Note that if the method returns an {@link OMNamespace}
+ * object, then its prefix will obviously be the empty string.
*/
OMNamespace getDefaultNamespace();
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java?rev=1215511&r1=1215510&r2=1215511&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java Sat Dec 17 15:28:57 2011
@@ -173,8 +173,7 @@ public class ElementImpl extends ParentN
// Special case: no namespace; we need to generate a namespace declaration only if
// there is a conflicting namespace declaration (i.e. a declaration for the default
// namespace with a non empty URI) is in scope
- OMNamespace defaultNamespace = getDefaultNamespace();
- if (defaultNamespace != null && defaultNamespace.getNamespaceURI().length() > 0) {
+ if (getDefaultNamespace() != null) {
declareDefaultNamespace("");
}
return null;
@@ -819,7 +818,7 @@ public class ElementImpl extends ParentN
if (namespaces != null) {
OMNamespaceImpl defaultNS = (OMNamespaceImpl) namespaces.get("");
if (defaultNS != null) {
- return defaultNS;
+ return defaultNS.getNamespaceURI().length() == 0 ? null : defaultNS;
}
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetDefaultNamespace2.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetDefaultNamespace2.java?rev=1215511&r1=1215510&r2=1215511&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetDefaultNamespace2.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetDefaultNamespace2.java Sat Dec 17 15:28:57 2011
@@ -44,7 +44,6 @@ public class TestGetDefaultNamespace2 ex
OMElement parent = factory.createOMElement("parent", "urn:test", "");
OMElement child = factory.createOMElement("child", null, parent);
OMNamespace ns = child.getDefaultNamespace();
- // TODO: need to specify if getDefaultNamespace should return null or ("","")
- assertTrue(ns == null || ns.equals("", ""));
+ assertNull(ns);
}
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1Unqualified.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1Unqualified.java?rev=1215511&r1=1215510&r2=1215511&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1Unqualified.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1Unqualified.java Sat Dec 17 15:28:57 2011
@@ -62,8 +62,7 @@ public class TestName1Unqualified extend
assertTrue(element.getLocalName().equals("library"));
assertNull(element.getNamespace());
- assertTrue(element.getDefaultNamespace() == null ||
- element.getDefaultNamespace().getNamespaceURI().length() == 0);
+ assertNull(element.getDefaultNamespace());
assertTrue(result.indexOf("xmlns=") <
0); // Make sure that the serialized string does not contain default prefix declaration
assertTrue("Serialized text error" + result, result.indexOf("1930110111") > 0);