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 2014/07/06 22:02:38 UTC

svn commit: r1608289 - 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/soap11/ axiom-dom/...

Author: veithen
Date: Sun Jul  6 20:02:38 2014
New Revision: 1608289

URL: http://svn.apache.org/r1608289
Log:
Tranformed OMElementHelper into an aspect.

Added:
    webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMElementSupport.aj
      - copied, changed from r1608275, webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMElementHelper.java
Removed:
    webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMElementHelper.java
Modified:
    webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMContainerSupport.aj
    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/soap/impl/dom/soap11/SOAP11FaultImpl.java
    webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultImpl.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/soap/impl/llom/soap11/SOAP11FaultImpl.java
    webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultImpl.java

Modified: webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMContainerSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMContainerSupport.aj?rev=1608289&r1=1608288&r2=1608289&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMContainerSupport.aj (original)
+++ webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMContainerSupport.aj Sun Jul  6 20:02:38 2014
@@ -45,7 +45,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 public aspect OMContainerSupport {
-//    declare parents: (InformationItem+ && OMContainer+) implements IContainer;
+    declare parents: (InformationItem+ && OMContainer+) implements IContainer;
     
     private static final Log log = LogFactory.getLog(OMContainerSupport.class);
     

Copied: webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMElementSupport.aj (from r1608275, webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMElementHelper.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMElementSupport.aj?p2=webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMElementSupport.aj&p1=webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMElementHelper.java&r1=1608275&r2=1608289&rev=1608289&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMElementHelper.java (original)
+++ webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMElementSupport.aj Sun Jul  6 20:02:38 2014
@@ -45,26 +45,26 @@ import org.apache.axiom.util.stax.XMLStr
  * Utility class with default implementations for some of the methods defined by the
  * {@link OMElement} interface.
  */
-public class OMElementHelper {
-    private OMElementHelper() {}
+public aspect OMElementSupport {
+    declare parents: (InformationItem+ && OMElement+) implements IElement;
     
-    public static NamespaceContext getNamespaceContext(OMElement element, boolean detached) {
+    public NamespaceContext OMElement.getNamespaceContext(boolean detached) {
         if (detached) {
             Map namespaces = new HashMap();
-            for (Iterator it = element.getNamespacesInScope(); it.hasNext(); ) {
+            for (Iterator it = getNamespacesInScope(); it.hasNext(); ) {
                 OMNamespace ns = (OMNamespace)it.next();
                 namespaces.put(ns.getPrefix(), ns.getNamespaceURI());
             }
             return new MapBasedNamespaceContext(namespaces);
         } else {
-            return new LiveNamespaceContext(element);
+            return new LiveNamespaceContext(this);
         }
     }
     
-    public static String getText(OMElement element) {
+    public String OMElement.getText() {
         String childText = null;
         StringBuffer buffer = null;
-        OMNode child = element.getFirstOMChild();
+        OMNode child = getFirstOMChild();
 
         while (child != null) {
             final int type = child.getType();
@@ -100,11 +100,11 @@ public class OMElementHelper {
         }
     }
     
-    public static Reader getTextAsStream(OMElement element, boolean cache) {
+    public Reader OMElement.getTextAsStream(boolean cache) {
         // If the element is not an OMSourcedElement and has not more than one child, then the most
         // efficient way to get the Reader is to build a StringReader
-        if (!(element instanceof OMSourcedElement) && (!cache || element.isComplete())) {
-            OMNode child = element.getFirstOMChild();
+        if (!(this instanceof OMSourcedElement) && (!cache || isComplete())) {
+            OMNode child = getFirstOMChild();
             if (child == null) {
                 return new StringReader("");
             } else if (child.getNextOMSibling() == null) {
@@ -113,7 +113,7 @@ public class OMElementHelper {
         }
         // In all other cases, extract the data from the XMLStreamReader
         try {
-            XMLStreamReader reader = element.getXMLStreamReader(cache);
+            XMLStreamReader reader = getXMLStreamReader(cache);
             if (reader.getEventType() == XMLStreamReader.START_DOCUMENT) {
                 reader.next();
             }
@@ -123,9 +123,9 @@ public class OMElementHelper {
         }
     }
     
-    public static void writeTextTo(OMElement element, Writer out, boolean cache) throws IOException {
+    public void OMElement.writeTextTo(Writer out, boolean cache) throws IOException {
         try {
-            XMLStreamReader reader = element.getXMLStreamReader(cache);
+            XMLStreamReader reader = getXMLStreamReader(cache);
             int depth = 0;
             while (reader.hasNext()) {
                 switch (reader.next()) {
@@ -147,11 +147,11 @@ public class OMElementHelper {
         }
     }
     
-    public static void discard(IElement that) {
-        if (that.getState() == CoreParentNode.INCOMPLETE && that.getBuilder() != null) {
-            ((StAXOMBuilder)that.getBuilder()).discard((OMContainer)that);
+    public void IElement.discard() {
+        if (getState() == CoreParentNode.INCOMPLETE && getBuilder() != null) {
+            ((StAXOMBuilder)getBuilder()).discard((OMContainer)this);
         }
-        that.detach();
+        detach();
     }
     
     public static void insertChild(OMElement parent, Class[] sequence, int pos, OMNode newChild) {

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=1608289&r1=1608288&r2=1608289&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 Sun Jul  6 20:02:38 2014
@@ -35,7 +35,6 @@ import org.apache.axiom.om.impl.common.I
 import org.apache.axiom.om.impl.common.CoreParentNode;
 import org.apache.axiom.om.impl.common.NamespaceIterator;
 import org.apache.axiom.om.impl.common.OMChildElementIterator;
-import org.apache.axiom.om.impl.common.OMElementHelper;
 import org.apache.axiom.om.impl.common.OMNamedInformationItemHelper;
 import org.apache.axiom.om.impl.common.OMNamespaceImpl;
 import org.apache.axiom.om.impl.common.serializer.push.OutputException;
@@ -52,14 +51,10 @@ import org.w3c.dom.Node;
 import org.w3c.dom.TypeInfo;
 
 import javax.xml.XMLConstants;
-import javax.xml.namespace.NamespaceContext;
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
 
 import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Writer;
 import java.util.ArrayList;
 import java.util.Iterator;
 
@@ -756,23 +751,11 @@ public class ElementImpl extends ParentN
                  || namespace != null && name.getNamespaceURI().equals(namespace.getNamespaceURI()));
     }
 
-    public String getText() {
-        return OMElementHelper.getText(this);
-    }
-
-    public Reader getTextAsStream(boolean cache) {
-        return OMElementHelper.getTextAsStream(this, cache);
-    }
-
     public QName getTextAsQName() {
         String childText = getText().trim();
         return childText.length() == 0 ? null : resolveQName(childText);
     }
 
-    public void writeTextTo(Writer out, boolean cache) throws IOException {
-        OMElementHelper.writeTextTo(this, out, cache);
-    }
-
     public void removeAttribute(OMAttribute attr) {
         if (attr.getOwner() != this) {
             throw new OMException("The attribute is not owned by this element");
@@ -882,10 +865,6 @@ public class ElementImpl extends ParentN
         return new NamespaceIterator(this);
     }
 
-    public NamespaceContext getNamespaceContext(boolean detached) {
-        return OMElementHelper.getNamespaceContext(this, detached);
-    }
-
     /** @see org.apache.axiom.om.OMElement#getAllAttributes() */
     public Iterator getAllAttributes() {
         if (attributes == null) {
@@ -987,10 +966,6 @@ public class ElementImpl extends ParentN
         return (ns != null) ? ns.getNamespaceURI() : null;
     }
 
-    public void discard() throws OMException {
-        OMElementHelper.discard(this);
-    }
-
     /*
      * DOM-Level 3 methods
      */

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=1608289&r1=1608288&r2=1608289&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 Sun Jul  6 20:02:38 2014
@@ -24,7 +24,7 @@ import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.common.OMElementHelper;
+import org.apache.axiom.om.impl.common.OMElementSupport;
 import org.apache.axiom.om.impl.dom.ParentNode;
 import org.apache.axiom.soap.SOAP11Constants;
 import org.apache.axiom.soap.SOAPBody;
@@ -74,7 +74,7 @@ public class SOAP11FaultImpl extends SOA
                     "Expecting SOAP 1.1 implementation of SOAP Fault Code. " +
                             "But received some other implementation");
         }
-        OMElementHelper.insertChild(this, sequence, 0, soapFaultCode);
+        OMElementSupport.insertChild(this, sequence, 0, soapFaultCode);
     }
 
     public void setReason(SOAPFaultReason reason) throws SOAPProcessingException {
@@ -83,7 +83,7 @@ public class SOAP11FaultImpl extends SOA
                     "Expecting SOAP 1.1 implementation of SOAP Fault Reason. " +
                             "But received some other implementation");
         }
-        OMElementHelper.insertChild(this, sequence, 1, reason);
+        OMElementSupport.insertChild(this, sequence, 1, reason);
     }
 
     public void setNode(SOAPFaultNode node) throws SOAPProcessingException {
@@ -96,7 +96,7 @@ public class SOAP11FaultImpl extends SOA
                     "Expecting SOAP 1.1 implementation of SOAP Fault Role. " +
                             "But received some other implementation");
         }
-        OMElementHelper.insertChild(this, sequence, 2, role);
+        OMElementSupport.insertChild(this, sequence, 2, role);
     }
 
     protected void checkParent(OMElement parent) throws SOAPProcessingException {
@@ -113,7 +113,7 @@ public class SOAP11FaultImpl extends SOA
                     "Expecting SOAP 1.1 implementation of SOAP Fault Detail. " +
                             "But received some other implementation");
         }
-        OMElementHelper.insertChild(this, sequence, 3, detail);
+        OMElementSupport.insertChild(this, sequence, 3, detail);
     }
 
     public SOAPFaultRole getRole() {

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=1608289&r1=1608288&r2=1608289&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 Sun Jul  6 20:02:38 2014
@@ -24,7 +24,7 @@ import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.common.OMElementHelper;
+import org.apache.axiom.om.impl.common.OMElementSupport;
 import org.apache.axiom.om.impl.dom.ParentNode;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPFactory;
@@ -74,7 +74,7 @@ public class SOAP12FaultImpl extends SOA
                     "Expecting SOAP 1.2 implementation of SOAP Fault Code. " +
                             "But received some other implementation");
         }
-        OMElementHelper.insertChild(this, sequence, 0, soapFaultCode);
+        OMElementSupport.insertChild(this, sequence, 0, soapFaultCode);
     }
 
 
@@ -83,7 +83,7 @@ public class SOAP12FaultImpl extends SOA
             throw new SOAPProcessingException(
                     "Expecting SOAP 1.2 implementation of SOAP Fault Reason. But received some other implementation");
         }
-        OMElementHelper.insertChild(this, sequence, 1, reason);
+        OMElementSupport.insertChild(this, sequence, 1, reason);
     }
 
     public void setNode(SOAPFaultNode node) throws SOAPProcessingException {
@@ -91,7 +91,7 @@ public class SOAP12FaultImpl extends SOA
             throw new SOAPProcessingException(
                     "Expecting SOAP 1.2 implementation of SOAP Fault Node. But received some other implementation");
         }
-        OMElementHelper.insertChild(this, sequence, 2, node);
+        OMElementSupport.insertChild(this, sequence, 2, node);
     }
 
     public void setRole(SOAPFaultRole role) throws SOAPProcessingException {
@@ -99,7 +99,7 @@ public class SOAP12FaultImpl extends SOA
             throw new SOAPProcessingException(
                     "Expecting SOAP 1.2 implementation of SOAP Fault Role. But received some other implementation");
         }
-        OMElementHelper.insertChild(this, sequence, 3, role);
+        OMElementSupport.insertChild(this, sequence, 3, role);
     }
 
     public void setDetail(SOAPFaultDetail detail) throws SOAPProcessingException {
@@ -107,7 +107,7 @@ public class SOAP12FaultImpl extends SOA
             throw new SOAPProcessingException(
                     "Expecting SOAP 1.2 implementation of SOAP Fault Detail. But received some other implementation");
         }
-        OMElementHelper.insertChild(this, sequence, 4, detail);
+        OMElementSupport.insertChild(this, sequence, 4, detail);
     }
 
     protected void checkParent(OMElement parent) throws SOAPProcessingException {

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=1608289&r1=1608288&r2=1608289&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 Sun Jul  6 20:02:38 2014
@@ -36,7 +36,6 @@ import org.apache.axiom.om.impl.common.I
 import org.apache.axiom.om.impl.common.IElement;
 import org.apache.axiom.om.impl.common.NamespaceIterator;
 import org.apache.axiom.om.impl.common.OMChildElementIterator;
-import org.apache.axiom.om.impl.common.OMElementHelper;
 import org.apache.axiom.om.impl.common.OMNamedInformationItemHelper;
 import org.apache.axiom.om.impl.common.OMNamespaceImpl;
 import org.apache.axiom.om.impl.common.serializer.push.OutputException;
@@ -49,16 +48,12 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.xml.sax.InputSource;
 
-import javax.xml.namespace.NamespaceContext;
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
 import javax.xml.transform.sax.SAXSource;
 
-import java.io.IOException;
-import java.io.Reader;
 import java.io.StringWriter;
-import java.io.Writer;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -396,10 +391,6 @@ public class OMElementImpl extends OMNod
         return new NamespaceIterator(this);
     }
 
-    public NamespaceContext getNamespaceContext(boolean detached) {
-        return OMElementHelper.getNamespaceContext(this, detached);
-    }
-
     /**
      * Returns a List of OMAttributes.
      *
@@ -627,23 +618,11 @@ public class OMElementImpl extends OMNod
         }
     }
 
-    public String getText() {
-        return OMElementHelper.getText(this);
-    }
-
-    public Reader getTextAsStream(boolean cache) {
-        return OMElementHelper.getTextAsStream(this, cache);
-    }
-
     public QName getTextAsQName() {
         String childText = getText().trim();
         return childText.length() == 0 ? null : resolveQName(childText);
     }
 
-    public void writeTextTo(Writer out, boolean cache) throws IOException {
-        OMElementHelper.writeTextTo(this, out, cache);
-    }
-
 ///////////////////////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -784,15 +763,6 @@ public class OMElementImpl extends OMNod
         return writer.toString();
     }
 
-    /**
-     * Method discard.
-     *
-     * @throws OMException
-     */
-    public void discard() throws OMException {
-        OMElementHelper.discard(this);
-    }
-
     public QName resolveQName(String qname) {
         int idx = qname.indexOf(':');
         if (idx == -1) {

Modified: webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultImpl.java?rev=1608289&r1=1608288&r2=1608289&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultImpl.java (original)
+++ webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultImpl.java Sun Jul  6 20:02:38 2014
@@ -21,7 +21,7 @@ package org.apache.axiom.soap.impl.llom.
 
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.common.OMElementHelper;
+import org.apache.axiom.om.impl.common.OMElementSupport;
 import org.apache.axiom.soap.SOAP11Constants;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPFactory;
@@ -74,7 +74,7 @@ public class SOAP11FaultImpl extends SOA
             throw new SOAPProcessingException(
                     "Expecting SOAP11FaultCodeImpl, got " + soapFaultCode.getClass());
         }
-        OMElementHelper.insertChild(this, sequence, 0, soapFaultCode);
+        OMElementSupport.insertChild(this, sequence, 0, soapFaultCode);
     }
 
     public void setReason(SOAPFaultReason reason) throws SOAPProcessingException {
@@ -82,7 +82,7 @@ public class SOAP11FaultImpl extends SOA
             throw new SOAPProcessingException(
                     "Expecting SOAP11FaultReasonImpl, got " + reason.getClass());
         }
-        OMElementHelper.insertChild(this, sequence, 1, reason);
+        OMElementSupport.insertChild(this, sequence, 1, reason);
     }
 
     public void setNode(SOAPFaultNode node) throws SOAPProcessingException {
@@ -94,7 +94,7 @@ public class SOAP11FaultImpl extends SOA
             throw new SOAPProcessingException(
                     "Expecting SOAP11FaultRoleImpl, got " + role.getClass());
         }
-        OMElementHelper.insertChild(this, sequence, 2, role);
+        OMElementSupport.insertChild(this, sequence, 2, role);
     }
 
     protected void checkParent(OMElement parent) throws SOAPProcessingException {
@@ -109,7 +109,7 @@ public class SOAP11FaultImpl extends SOA
             throw new SOAPProcessingException(
                     "Expecting SOAP11FaultDetailImpl, got " + detail.getClass());
         }
-        OMElementHelper.insertChild(this, sequence, 3, detail);
+        OMElementSupport.insertChild(this, sequence, 3, detail);
     }
 
     public SOAPFaultCode getCode() {

Modified: webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultImpl.java?rev=1608289&r1=1608288&r2=1608289&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultImpl.java (original)
+++ webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultImpl.java Sun Jul  6 20:02:38 2014
@@ -21,7 +21,7 @@ package org.apache.axiom.soap.impl.llom.
 
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.common.OMElementHelper;
+import org.apache.axiom.om.impl.common.OMElementSupport;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPFault;
@@ -73,7 +73,7 @@ public class SOAP12FaultImpl extends SOA
             throw new SOAPProcessingException(
                     "Expecting SOAP12FaultCodeImpl, got " + soapFaultCode.getClass());
         }
-        OMElementHelper.insertChild(this, sequence, 0, soapFaultCode);
+        OMElementSupport.insertChild(this, sequence, 0, soapFaultCode);
     }
 
 
@@ -82,7 +82,7 @@ public class SOAP12FaultImpl extends SOA
             throw new SOAPProcessingException(
                     "Expecting SOAP12FaultReasonImpl, got " + reason.getClass());
         }
-        OMElementHelper.insertChild(this, sequence, 1, reason);
+        OMElementSupport.insertChild(this, sequence, 1, reason);
     }
 
     public void setNode(SOAPFaultNode node) throws SOAPProcessingException {
@@ -90,7 +90,7 @@ public class SOAP12FaultImpl extends SOA
             throw new SOAPProcessingException(
                     "Expecting SOAP12FaultNodeImpl, got " + node.getClass());
         }
-        OMElementHelper.insertChild(this, sequence, 2, node);
+        OMElementSupport.insertChild(this, sequence, 2, node);
     }
 
     public void setRole(SOAPFaultRole role) throws SOAPProcessingException {
@@ -98,7 +98,7 @@ public class SOAP12FaultImpl extends SOA
             throw new SOAPProcessingException(
                     "Expecting SOAP12FaultRoleImpl, got " + role.getClass());
         }
-        OMElementHelper.insertChild(this, sequence, 3, role);
+        OMElementSupport.insertChild(this, sequence, 3, role);
     }
 
     public void setDetail(SOAPFaultDetail detail) throws SOAPProcessingException {
@@ -106,7 +106,7 @@ public class SOAP12FaultImpl extends SOA
             throw new SOAPProcessingException(
                     "Expecting SOAP12FaultDetailImpl, got " + detail.getClass());
         }
-        OMElementHelper.insertChild(this, sequence, 4, detail);
+        OMElementSupport.insertChild(this, sequence, 4, detail);
     }
 
     protected void checkParent(OMElement parent) throws SOAPProcessingException {