You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by ch...@apache.org on 2006/12/14 13:15:15 UTC
svn commit: r487185 - in
/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom:
OMElementImpl.java OMSourcedElementImpl.java OMTextImpl.java
Author: chinthaka
Date: Thu Dec 14 04:15:14 2006
New Revision: 487185
URL: http://svn.apache.org/viewvc?view=rev&rev=487185
Log:
Fixing a problem with handling text as QNames.
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMTextImpl.java
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java?view=diff&rev=487185&r1=487184&r2=487185
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java Thu Dec 14 04:15:14 2006
@@ -184,6 +184,15 @@
return namespace;
}
+ OMNamespace handleNamespace(String namespaceURI, String prefix) {
+ OMNamespace namespace = findNamespace(namespaceURI,
+ prefix);
+ if (namespace == null) {
+ namespace = declareNamespace(namespaceURI, prefix);
+ }
+ return namespace;
+ }
+
/**
* Adds child to the element. One can decide whether to append the child or to add to the
* front of the children list.
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java?view=diff&rev=487185&r1=487184&r2=487185
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java Thu Dec 14 04:15:14 2006
@@ -779,4 +779,9 @@
protected void notifyChildComplete() {
super.notifyChildComplete();
}
+
+
+ OMNamespace handleNamespace(String namespaceURI, String prefix) {
+ return super.handleNamespace(namespaceURI, prefix); //To change body of overridden methods use File | Settings | File Templates.
+ }
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMTextImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMTextImpl.java?view=diff&rev=487185&r1=487184&r2=487185
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMTextImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMTextImpl.java Thu Dec 14 04:15:14 2006
@@ -125,7 +125,7 @@
OMFactory factory) {
super(parent, factory, true);
this.calcNS = true;
- this.textNS = ((OMElementImpl) parent).handleNamespace(text);
+ this.textNS = ((OMElementImpl) parent).handleNamespace(text.getNamespaceURI(), text.getPrefix());
this.value = text == null ? EMTPY_STRING : text.getLocalPart();
this.nodeType = nodeType;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: commons-dev-help@ws.apache.org