ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1609982 - in /webservices/axiom/trunk/modules: axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/ axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/ axiom-dom/src/mai...
Date Sat, 12 Jul 2014 16:38:48 GMT
Author: veithen
Date: Sat Jul 12 16:38:47 2014
New Revision: 1609982

URL: http://svn.apache.org/r1609982
Log:
Correctly encapsulate the namespace and local name of elements and attributes.

Modified:
    webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/INamedInformationItem.java
    webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java
    webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
    webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NamedNode.java
    webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPElement.java
    webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPEnvelopeImpl.java
    webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11BodyImpl.java
    webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultCodeImpl.java
    webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultDetailImpl.java
    webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultImpl.java
    webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultReasonImpl.java
    webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultRoleImpl.java
    webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11HeaderImpl.java
    webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12BodyImpl.java
    webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultCodeImpl.java
    webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultDetailImpl.java
    webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultImpl.java
    webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultNodeImpl.java
    webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultReasonImpl.java
    webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultRoleImpl.java
    webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultSubCodeImpl.java
    webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultTextImpl.java
    webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultValueImpl.java
    webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12HeaderImpl.java
    webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMAttributeImpl.java
    webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
    webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
    webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPElement.java

Modified: webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/INamedInformationItem.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/INamedInformationItem.java?rev=1609982&r1=1609981&r2=1609982&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/INamedInformationItem.java
(original)
+++ webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/INamedInformationItem.java
Sat Jul 12 16:38:47 2014
@@ -19,7 +19,16 @@
 package org.apache.axiom.om.impl.common;
 
 import org.apache.axiom.om.OMNamedInformationItem;
+import org.apache.axiom.om.OMNamespace;
 
 public interface INamedInformationItem extends OMNamedInformationItem {
-
+    String internalGetLocalName();
+    void internalSetLocalName(String localName);
+    
+    /**
+     * Set the namespace of the node without adding a corresponding namespace declaration.
+     * 
+     * @param namespace
+     */
+    void internalSetNamespace(OMNamespace namespace);
 }

Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java?rev=1609982&r1=1609981&r2=1609982&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java
(original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java
Sat Jul 12 16:38:47 2014
@@ -499,4 +499,12 @@ public class AttrImpl extends RootNode i
         Element ownerElement = getOwnerElement();
         return ownerElement == null ? null : ownerElement.lookupPrefix(namespaceURI);
     }
+
+    public final String internalGetLocalName() {
+        return localName;
+    }
+
+    public final void internalSetLocalName(String localName) {
+        this.localName = localName;
+    }
 }

Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java?rev=1609982&r1=1609981&r2=1609982&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
(original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
Sat Jul 12 16:38:47 2014
@@ -80,9 +80,9 @@ public class ElementImpl extends ParentN
      * </ul>
      * </ul>
      */
-    protected OMNamespace namespace;
+    private OMNamespace namespace;
 
-    protected String localName;
+    private String localName;
 
     private AttributeMap attributes;
 
@@ -1088,4 +1088,12 @@ public class ElementImpl extends ParentN
 
     public final void checkChild(OMNode child) {
     }
+
+    public final String internalGetLocalName() {
+        return localName;
+    }
+
+    public final void internalSetLocalName(String localName) {
+        this.localName = localName;
+    }
 }

Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NamedNode.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NamedNode.java?rev=1609982&r1=1609981&r2=1609982&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NamedNode.java
(original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NamedNode.java
Sat Jul 12 16:38:47 2014
@@ -18,14 +18,8 @@
  */
 package org.apache.axiom.om.impl.dom;
 
-import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.om.impl.common.INamedInformationItem;
 
 interface NamedNode extends INamedInformationItem {
-    /**
-     * Set the namespace of the node without adding a corresponding namespace declaration.
-     * 
-     * @param namespace
-     */
-    void internalSetNamespace(OMNamespace namespace);
+
 }

Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPElement.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPElement.java?rev=1609982&r1=1609981&r2=1609982&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPElement.java
(original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPElement.java
Sat Jul 12 16:38:47 2014
@@ -44,9 +44,8 @@ public abstract class SOAPElement extend
         checkParent(parent);
 
         if (extractNamespaceFromParent) {
-            this.namespace = parent.getNamespace();
+            internalSetNamespace(parent.getNamespace());
         }
-        this.localName = localName;
     }
 
     public SOAPElement(ParentNode parentNode, String localName, OMNamespace ns,

Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPEnvelopeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPEnvelopeImpl.java?rev=1609982&r1=1609981&r2=1609982&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPEnvelopeImpl.java
(original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPEnvelopeImpl.java
Sat Jul 12 16:38:47 2014
@@ -259,6 +259,6 @@ public class SOAPEnvelopeImpl extends SO
     }
 
     protected OMElement createClone(OMCloneOptions options, ParentNode targetParent, boolean
generateNSDecl) {
-        return new SOAPEnvelopeImpl(targetParent, namespace, null, getOMFactory(), generateNSDecl);
+        return new SOAPEnvelopeImpl(targetParent, getNamespace(), null, getOMFactory(), generateNSDecl);
     }
 }

Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11BodyImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11BodyImpl.java?rev=1609982&r1=1609981&r2=1609982&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11BodyImpl.java
(original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11BodyImpl.java
Sat Jul 12 16:38:47 2014
@@ -49,6 +49,6 @@ public class SOAP11BodyImpl extends SOAP
     }
 
     protected OMElement createClone(OMCloneOptions options, ParentNode targetParent, boolean
generateNSDecl) {
-        return new SOAP11BodyImpl(targetParent, namespace, null, getOMFactory(), generateNSDecl);
+        return new SOAP11BodyImpl(targetParent, getNamespace(), null, getOMFactory(), generateNSDecl);
     }
 }

Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultCodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultCodeImpl.java?rev=1609982&r1=1609981&r2=1609982&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultCodeImpl.java
(original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultCodeImpl.java
Sat Jul 12 16:38:47 2014
@@ -82,6 +82,6 @@ public class SOAP11FaultCodeImpl extends
 
     protected OMElement createClone(OMCloneOptions options, ParentNode targetParent,
             boolean generateNSDecl) {
-        return new SOAP11FaultCodeImpl(targetParent, namespace, null, getOMFactory(), generateNSDecl);
+        return new SOAP11FaultCodeImpl(targetParent, getNamespace(), null, getOMFactory(),
generateNSDecl);
     }
 }

Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultDetailImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultDetailImpl.java?rev=1609982&r1=1609981&r2=1609982&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultDetailImpl.java
(original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultDetailImpl.java
Sat Jul 12 16:38:47 2014
@@ -51,6 +51,6 @@ public class SOAP11FaultDetailImpl exten
 
     protected OMElement createClone(OMCloneOptions options, ParentNode targetParent,
             boolean generateNSDecl) {
-        return new SOAP11FaultDetailImpl(targetParent, namespace, null, getOMFactory(), generateNSDecl);
+        return new SOAP11FaultDetailImpl(targetParent, getNamespace(), null, getOMFactory(),
generateNSDecl);
     }
 }

Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultImpl.java?rev=1609982&r1=1609981&r2=1609982&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultImpl.java
(original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultImpl.java
Sat Jul 12 16:38:47 2014
@@ -138,7 +138,7 @@ public class SOAP11FaultImpl extends SOA
 
     protected OMElement createClone(OMCloneOptions options, ParentNode targetParent,
             boolean generateNSDecl) {
-        SOAPFault clone = new SOAP11FaultImpl(targetParent, namespace, null, getOMFactory(),
generateNSDecl);
+        SOAPFault clone = new SOAP11FaultImpl(targetParent, getNamespace(), null, getOMFactory(),
generateNSDecl);
         if (e != null) {
             clone.setException(e);
         }

Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultReasonImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultReasonImpl.java?rev=1609982&r1=1609981&r2=1609982&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultReasonImpl.java
(original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultReasonImpl.java
Sat Jul 12 16:38:47 2014
@@ -67,6 +67,6 @@ public class SOAP11FaultReasonImpl exten
 
     protected OMElement createClone(OMCloneOptions options, ParentNode targetParent,
             boolean generateNSDecl) {
-        return new SOAP11FaultReasonImpl(targetParent, namespace, null, getOMFactory(), generateNSDecl);
+        return new SOAP11FaultReasonImpl(targetParent, getNamespace(), null, getOMFactory(),
generateNSDecl);
     }
 }

Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultRoleImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultRoleImpl.java?rev=1609982&r1=1609981&r2=1609982&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultRoleImpl.java
(original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultRoleImpl.java
Sat Jul 12 16:38:47 2014
@@ -54,6 +54,6 @@ public class SOAP11FaultRoleImpl extends
 
     protected OMElement createClone(OMCloneOptions options, ParentNode targetParent,
             boolean generateNSDecl) {
-        return new SOAP11FaultRoleImpl(targetParent, namespace, null, getOMFactory(), generateNSDecl);
+        return new SOAP11FaultRoleImpl(targetParent, getNamespace(), null, getOMFactory(),
generateNSDecl);
     }
 }

Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11HeaderImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11HeaderImpl.java?rev=1609982&r1=1609981&r2=1609982&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11HeaderImpl.java
(original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11HeaderImpl.java
Sat Jul 12 16:38:47 2014
@@ -61,6 +61,6 @@ public class SOAP11HeaderImpl extends SO
 
     protected OMElement createClone(OMCloneOptions options, ParentNode targetParent,
             boolean generateNSDecl) {
-        return new SOAP11HeaderImpl(targetParent, namespace, null, getOMFactory(), generateNSDecl);
+        return new SOAP11HeaderImpl(targetParent, getNamespace(), null, getOMFactory(), generateNSDecl);
     }
 }

Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12BodyImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12BodyImpl.java?rev=1609982&r1=1609981&r2=1609982&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12BodyImpl.java
(original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12BodyImpl.java
Sat Jul 12 16:38:47 2014
@@ -49,6 +49,6 @@ public class SOAP12BodyImpl extends SOAP
     }
 
     protected OMElement createClone(OMCloneOptions options, ParentNode targetParent, boolean
generateNSDecl) {
-        return new SOAP12BodyImpl(targetParent, namespace, null, getOMFactory(), generateNSDecl);
+        return new SOAP12BodyImpl(targetParent, getNamespace(), null, getOMFactory(), generateNSDecl);
     }
 }

Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultCodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultCodeImpl.java?rev=1609982&r1=1609981&r2=1609982&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultCodeImpl.java
(original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultCodeImpl.java
Sat Jul 12 16:38:47 2014
@@ -100,6 +100,6 @@ public class SOAP12FaultCodeImpl extends
 
     protected OMElement createClone(OMCloneOptions options, ParentNode targetParent,
             boolean generateNSDecl) {
-        return new SOAP12FaultCodeImpl(targetParent, namespace, null, getOMFactory(), generateNSDecl);
+        return new SOAP12FaultCodeImpl(targetParent, getNamespace(), null, getOMFactory(),
generateNSDecl);
     }
 }

Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultDetailImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultDetailImpl.java?rev=1609982&r1=1609981&r2=1609982&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultDetailImpl.java
(original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultDetailImpl.java
Sat Jul 12 16:38:47 2014
@@ -51,6 +51,6 @@ public class SOAP12FaultDetailImpl exten
 
     protected OMElement createClone(OMCloneOptions options, ParentNode targetParent,
             boolean generateNSDecl) {
-        return new SOAP12FaultDetailImpl(targetParent, namespace, null, getOMFactory(), generateNSDecl);
+        return new SOAP12FaultDetailImpl(targetParent, getNamespace(), null, getOMFactory(),
generateNSDecl);
     }
 }

Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultImpl.java?rev=1609982&r1=1609981&r2=1609982&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultImpl.java
(original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultImpl.java
Sat Jul 12 16:38:47 2014
@@ -139,7 +139,7 @@ public class SOAP12FaultImpl extends SOA
 
     protected OMElement createClone(OMCloneOptions options, ParentNode targetParent,
             boolean generateNSDecl) {
-        SOAPFault clone = new SOAP12FaultImpl(targetParent, namespace, null, getOMFactory(),
generateNSDecl);
+        SOAPFault clone = new SOAP12FaultImpl(targetParent, getNamespace(), null, getOMFactory(),
generateNSDecl);
         if (e != null) {
             clone.setException(e);
         }

Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultNodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultNodeImpl.java?rev=1609982&r1=1609981&r2=1609982&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultNodeImpl.java
(original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultNodeImpl.java
Sat Jul 12 16:38:47 2014
@@ -69,6 +69,6 @@ public class SOAP12FaultNodeImpl extends
 
     protected OMElement createClone(OMCloneOptions options, ParentNode targetParent,
             boolean generateNSDecl) {
-        return new SOAP12FaultNodeImpl(targetParent, namespace, null, getOMFactory(), generateNSDecl);
+        return new SOAP12FaultNodeImpl(targetParent, getNamespace(), null, getOMFactory(),
generateNSDecl);
     }
 }

Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultReasonImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultReasonImpl.java?rev=1609982&r1=1609981&r2=1609982&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultReasonImpl.java
(original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultReasonImpl.java
Sat Jul 12 16:38:47 2014
@@ -68,6 +68,6 @@ public class SOAP12FaultReasonImpl exten
 
     protected OMElement createClone(OMCloneOptions options, ParentNode targetParent,
             boolean generateNSDecl) {
-        return new SOAP12FaultReasonImpl(targetParent, namespace, null, getOMFactory(), generateNSDecl);
+        return new SOAP12FaultReasonImpl(targetParent, getNamespace(), null, getOMFactory(),
generateNSDecl);
     }
 }

Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultRoleImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultRoleImpl.java?rev=1609982&r1=1609981&r2=1609982&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultRoleImpl.java
(original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultRoleImpl.java
Sat Jul 12 16:38:47 2014
@@ -53,6 +53,6 @@ public class SOAP12FaultRoleImpl extends
 
     protected OMElement createClone(OMCloneOptions options, ParentNode targetParent,
             boolean generateNSDecl) {
-        return new SOAP12FaultRoleImpl(targetParent, namespace, null, getOMFactory(), generateNSDecl);
+        return new SOAP12FaultRoleImpl(targetParent, getNamespace(), null, getOMFactory(),
generateNSDecl);
     }
 }

Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultSubCodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultSubCodeImpl.java?rev=1609982&r1=1609981&r2=1609982&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultSubCodeImpl.java
(original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultSubCodeImpl.java
Sat Jul 12 16:38:47 2014
@@ -114,6 +114,6 @@ public class SOAP12FaultSubCodeImpl exte
 
     protected OMElement createClone(OMCloneOptions options, ParentNode targetParent,
             boolean generateNSDecl) {
-        return new SOAP12FaultSubCodeImpl(targetParent, namespace, null, getOMFactory(),
generateNSDecl);
+        return new SOAP12FaultSubCodeImpl(targetParent, getNamespace(), null, getOMFactory(),
generateNSDecl);
     }
 }

Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultTextImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultTextImpl.java?rev=1609982&r1=1609981&r2=1609982&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultTextImpl.java
(original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultTextImpl.java
Sat Jul 12 16:38:47 2014
@@ -88,6 +88,6 @@ public class SOAP12FaultTextImpl extends
 
     protected OMElement createClone(OMCloneOptions options, ParentNode targetParent,
             boolean generateNSDecl) {
-        return new SOAP12FaultTextImpl(targetParent, namespace, null, getOMFactory(), generateNSDecl);
+        return new SOAP12FaultTextImpl(targetParent, getNamespace(), null, getOMFactory(),
generateNSDecl);
     }
 }
\ No newline at end of file

Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultValueImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultValueImpl.java?rev=1609982&r1=1609981&r2=1609982&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultValueImpl.java
(original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultValueImpl.java
Sat Jul 12 16:38:47 2014
@@ -53,6 +53,6 @@ public class SOAP12FaultValueImpl extend
 
     protected OMElement createClone(OMCloneOptions options, ParentNode targetParent,
             boolean generateNSDecl) {
-        return new SOAP12FaultValueImpl(targetParent, namespace, null, getOMFactory(), generateNSDecl);
+        return new SOAP12FaultValueImpl(targetParent, getNamespace(), null, getOMFactory(),
generateNSDecl);
     }
 }

Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12HeaderImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12HeaderImpl.java?rev=1609982&r1=1609981&r2=1609982&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12HeaderImpl.java
(original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12HeaderImpl.java
Sat Jul 12 16:38:47 2014
@@ -58,6 +58,6 @@ public class SOAP12HeaderImpl extends SO
 
     protected OMElement createClone(OMCloneOptions options, ParentNode targetParent,
             boolean generateNSDecl) {
-        return new SOAP12HeaderImpl(targetParent, namespace, null, getOMFactory(), generateNSDecl);
+        return new SOAP12HeaderImpl(targetParent, getNamespace(), null, getOMFactory(), generateNSDecl);
     }
 }

Modified: webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMAttributeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMAttributeImpl.java?rev=1609982&r1=1609981&r2=1609982&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMAttributeImpl.java
(original)
+++ webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMAttributeImpl.java
Sat Jul 12 16:38:47 2014
@@ -160,6 +160,11 @@ public class OMAttributeImpl implements 
         this.type = type;
     }
 
+    public final void internalSetNamespace(OMNamespace namespace) {
+        this.namespace = namespace;
+        this.qName = null;
+    }
+
     public void setNamespace(OMNamespace namespace, boolean declare) {
         this.namespace = handleNamespace(owner, namespace, true, declare);
         this.qName = null;
@@ -250,4 +255,12 @@ public class OMAttributeImpl implements 
     public OMInformationItem clone(OMCloneOptions options) {
         return new OMAttributeImpl(localName, namespace, value, factory);
     }
+
+    public final String internalGetLocalName() {
+        return localName;
+    }
+
+    public final void internalSetLocalName(String localName) {
+        this.localName = localName;
+    }
 }

Modified: webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java?rev=1609982&r1=1609981&r2=1609982&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
(original)
+++ webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
Sat Jul 12 16:38:47 2014
@@ -70,12 +70,12 @@ public class OMElementImpl extends OMNod
      * </ul>
      * </ul>
      */
-    protected OMNamespace ns;
+    private OMNamespace ns;
 
     /** Field localName */
-    protected String localName;
+    private String localName;
 
-    protected QName qName;
+    private QName qName;
 
     /** Field namespaces */
     protected HashMap namespaces = null;
@@ -608,6 +608,11 @@ public class OMElementImpl extends OMNod
         setNamespace(namespace, true);
     }
 
+    public final void internalSetNamespace(OMNamespace namespace) {
+        this.ns = namespace;
+        this.qName = null;
+    }
+
     public void setNamespaceWithNoFindInCurrentScope(OMNamespace namespace) {
         this.ns = namespace;
         this.qName = null;
@@ -757,5 +762,13 @@ public class OMElementImpl extends OMNod
             this.setComplete(true);
         }
     }
+
+    public final String internalGetLocalName() {
+        return localName;
+    }
+
+    public final void internalSetLocalName(String localName) {
+        this.localName = localName;
+    }
 }
 

Modified: webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java?rev=1609982&r1=1609981&r2=1609982&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
(original)
+++ webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
Sat Jul 12 16:38:47 2014
@@ -20,7 +20,6 @@
 package org.apache.axiom.om.impl.llom;
 
 import org.apache.axiom.core.CoreChildNode;
-import org.apache.axiom.core.CoreParentNode;
 import org.apache.axiom.om.OMAttribute;
 import org.apache.axiom.om.OMCloneOptions;
 import org.apache.axiom.om.OMContainer;
@@ -206,7 +205,7 @@ public class OMSourcedElementImpl extend
      * @return name
      */
     private String getPrintableName() {
-        if (isExpanded || (definedNamespaceSet && localName != null)) {
+        if (isExpanded || (definedNamespaceSet && internalGetLocalName() != null))
{
             String uri = null;
             if (getNamespace() != null) {
                 uri = getNamespace().getNamespaceURI();
@@ -298,14 +297,14 @@ public class OMSourcedElementImpl extend
      * @param staxNamespaceURI
      */
     void validateName(String staxPrefix, String staxLocalName, String staxNamespaceURI) {
-        if (localName == null) {
+        if (internalGetLocalName() == null) {
             // The local name was not known in advance; initialize it from the reader
-            localName = staxLocalName;
+            internalSetLocalName(staxLocalName);
         } else {
             // Make sure element local name and namespace matches what was expected
-            if (!staxLocalName.equals(localName)) {
+            if (!staxLocalName.equals(internalGetLocalName())) {
                 throw new OMException("Element name from data source is " +
-                        staxLocalName + ", not the expected " + localName);
+                        staxLocalName + ", not the expected " + internalGetLocalName());
             }
         }
         if (definedNamespaceSet) {
@@ -430,14 +429,6 @@ public class OMSourcedElementImpl extend
         super.removeAttribute(attr);
     }
 
-    public void coreSetFirstChild(CoreChildNode firstChild) {
-        super.coreSetFirstChild(firstChild);
-    }
-
-    public void coreSetLastChild(CoreChildNode lastChild) {
-        super.coreSetLastChild(lastChild);
-    }
-
     public OMElement getFirstElement() {
         return super.getFirstElement();
     }
@@ -480,11 +471,11 @@ public class OMSourcedElementImpl extend
     }
 
     private void ensureLocalNameSet() {
-        if (localName == null) {
+        if (internalGetLocalName() == null) {
             if (dataSource instanceof QNameAwareOMDataSource) {
-                localName = ((QNameAwareOMDataSource)dataSource).getLocalName();
+                internalSetLocalName(((QNameAwareOMDataSource)dataSource).getLocalName());
             }
-            if (localName == null) {
+            if (internalGetLocalName() == null) {
                 forceExpand();
             }
         }
@@ -631,7 +622,7 @@ public class OMSourcedElementImpl extend
             targetOMSE = (OMSourcedElementImpl)getOMFactory().createOMElement(targetDS);
         }
         
-        targetOMSE.localName = localName;
+        targetOMSE.internalSetLocalName(internalGetLocalName());
         targetOMSE.definedNamespaceSet = definedNamespaceSet;
         if (definedNamespace instanceof DeferredNamespace) {
             targetOMSE.definedNamespace = targetOMSE.new DeferredNamespace(definedNamespace.getNamespaceURI());
@@ -785,54 +776,6 @@ public class OMSourcedElementImpl extend
         }
     }
 
-    public void addChild(OMNode omNode) {
-        super.addChild(omNode);
-    }
-
-    public void addChild(OMNode omNode, boolean fromBuilder) {
-        super.addChild(omNode, fromBuilder);
-    }
-
-    public void checkChild(OMNode child) {
-        super.checkChild(child);
-    }
-
-    public Iterator getChildrenWithName(QName elementQName) {
-        return super.getChildrenWithName(elementQName);
-    }
-    
-    public Iterator getChildrenWithLocalName(String localName) {
-        return super.getChildrenWithLocalName(localName);
-    }
-
-    public Iterator getChildrenWithNamespaceURI(String uri) {
-        return super.getChildrenWithNamespaceURI(uri);
-    }
-
-    public OMElement getFirstChildWithName(QName elementQName) throws OMException {
-        return super.getFirstChildWithName(elementQName);
-    }
-
-    public Iterator getChildren() {
-        return super.getChildren();
-    }
-
-    public Iterator getDescendants(boolean includeSelf) {
-        return super.getDescendants(includeSelf);
-    }
-
-    public OMNode getFirstOMChild() {
-        return super.getFirstOMChild();
-    }
-
-    public OMNode getFirstOMChildIfAvailable() {
-        return super.getFirstOMChildIfAvailable();
-    }
-
-    public CoreChildNode getLastKnownOMChild() {
-        return super.coreGetLastKnownChild();
-    }
-
     public OMNode detach() throws OMException {
         // detach without expanding the tree
         boolean complete = isComplete();
@@ -1046,40 +989,8 @@ public class OMSourcedElementImpl extend
         }
     }
 
-    public void removeChildren() {
-        super.removeChildren();
-    }
-    
-    public void defaultBuild() {
-        super.defaultBuild();
-    }
-    
-    public void buildNext() {
-        super.buildNext();
-    }
-
-    public CoreParentNode coreGetParent() {
-        return super.coreGetParent();
-    }
-
-    public void coreSetParent(CoreParentNode element) {
-        super.coreSetParent(element);
-    }
-
-    public CoreChildNode coreGetFirstChild() {
-        return super.coreGetFirstChild();
-    }
-
     public CoreChildNode coreGetFirstChildIfAvailable() {
         forceExpand();
         return super.coreGetFirstChildIfAvailable();
     }
-
-    public CoreChildNode coreGetLastKnownChild() {
-        return super.coreGetLastKnownChild();
-    }
-    
-    public void detachAndDiscardParent() {
-        super.detachAndDiscardParent();
-    }
 }

Modified: webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPElement.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPElement.java?rev=1609982&r1=1609981&r2=1609982&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPElement.java
(original)
+++ webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPElement.java
Sat Jul 12 16:38:47 2014
@@ -48,7 +48,7 @@ public abstract class SOAPElement extend
         checkParent(parent);
 
         if (extractNamespaceFromParent) {
-            this.ns = parent.getNamespace();
+            internalSetNamespace(parent.getNamespace());
         }
     }
 



Mime
View raw message