Author: veithen
Date: Mon Aug 31 22:44:25 2015
New Revision: 1700367
URL: http://svn.apache.org/r1700367
Log:
Some cleanup of the clone code.
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomElementSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomInformationItemSupport.aj
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NSAwareElement.java
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMInformationItemImpl.java
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomElementSupport.aj
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomElementSupport.aj?rev=1700367&r1=1700366&r2=1700367&view=diff
==============================================================================
---
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomElementSupport.aj
(original)
+++
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomElementSupport.aj
Mon Aug 31 22:44:25 2015
@@ -32,7 +32,6 @@ import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.axiom.core.ClonePolicy;
import org.apache.axiom.core.CoreAttribute;
import org.apache.axiom.core.CoreParentNode;
import org.apache.axiom.core.ElementAction;
@@ -40,7 +39,6 @@ import org.apache.axiom.core.IdentityMap
import org.apache.axiom.core.NodeMigrationException;
import org.apache.axiom.core.NodeMigrationPolicy;
import org.apache.axiom.om.OMAttribute;
-import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMConstants;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMElement;
@@ -541,14 +539,8 @@ public aspect AxiomElementSupport {
}
}
- public final <T> AxiomElement
AxiomElement.shallowCloneWithoutAttributes(ClonePolicy<T> policy, T options,
CoreParentNode targetParent, boolean namespaceRepairing) {
- AxiomElement clone =
(AxiomElement)coreGetNodeFactory().createNode(policy.getTargetNodeClass(options,
this));
- if (targetParent != null) {
- targetParent.coreAppendChild(clone, false);
- }
- clone.initName(getLocalName(), getNamespace(), namespaceRepairing);
- clone.initAncillaryData(policy, options, this);
- return clone;
+ public final OMElement AxiomElement.cloneOMElement() {
+ return (OMElement)clone(null);
}
public final void AxiomElement.buildWithAttachments() {
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomInformationItemSupport.aj
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomInformationItemSupport.aj?rev=1700367&r1=1700366&r2=1700367&view=diff
==============================================================================
---
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomInformationItemSupport.aj
(original)
+++
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomInformationItemSupport.aj
Mon Aug 31 22:44:25 2015
@@ -19,9 +19,15 @@
package org.apache.axiom.om.impl.common;
import org.apache.axiom.core.NodeFactory;
+import org.apache.axiom.om.OMCloneOptions;
+import org.apache.axiom.om.OMInformationItem;
public aspect AxiomInformationItemSupport {
public final NodeFactory AxiomInformationItem.coreGetNodeFactory() {
return (NodeFactory)getOMFactory();
}
+
+ public final OMInformationItem AxiomInformationItem.clone(OMCloneOptions
options) {
+ return (OMInformationItem)coreClone(Policies.CLONE_POLICY, options);
+ }
}
Modified:
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NSAwareElement.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NSAwareElement.java?rev=1700367&r1=1700366&r2=1700367&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NSAwareElement.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NSAwareElement.java
Mon Aug 31 22:44:25 2015
@@ -47,10 +47,6 @@ public class NSAwareElement extends Elem
setNamespace(namespace, true);
}
- public OMElement cloneOMElement() {
- return (OMElement)clone(new OMCloneOptions());
- }
-
public void setLineNumber(int lineNumber) {
this.lineNumber = lineNumber;
}
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=1700367&r1=1700366&r2=1700367&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
Mon Aug 31 22:44:25 2015
@@ -22,9 +22,7 @@ package org.apache.axiom.om.impl.dom;
import static org.apache.axiom.dom.DOMExceptionTranslator.newDOMException;
import org.apache.axiom.dom.DOMNode;
-import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMInformationItem;
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
import org.w3c.dom.DOMException;
@@ -316,8 +314,4 @@ public abstract class NodeImpl implement
// /
public abstract OMXMLParserWrapper getBuilder();
-
- public final OMInformationItem clone(OMCloneOptions options) {
- return
(OMInformationItem)coreClone(org.apache.axiom.om.impl.common.Policies.CLONE_POLICY,
options);
- }
}
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java?rev=1700367&r1=1700366&r2=1700367&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
Mon Aug 31 22:44:25 2015
@@ -19,27 +19,18 @@
package org.apache.axiom.om.impl.llom;
-import org.apache.axiom.om.OMAttribute;
-import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMConstants;
-import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.impl.common.AxiomContainer;
import org.apache.axiom.om.impl.common.AxiomElement;
-import org.apache.axiom.om.impl.common.Policies;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import java.util.Iterator;
/** Class OMElementImpl */
public class OMElementImpl extends OMNodeImpl
implements AxiomElement, OMConstants {
-
- private static final Log log = LogFactory.getLog(OMElementImpl.class);
private int lineNumber;
@@ -73,17 +64,6 @@ public class OMElementImpl extends OMNod
setNamespace(namespace, true);
}
- public final OMElement cloneOMElement() {
-
- if (log.isDebugEnabled()) {
- log.debug("cloneOMElement start");
- log.debug(" element string =" + getLocalName());
- log.debug(" isComplete = " + isComplete());
- log.debug(" builder = " + getBuilder());
- }
- return (OMElement)clone(new OMCloneOptions());
- }
-
public final void setLineNumber(int lineNumber) {
this.lineNumber = lineNumber;
}
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMInformationItemImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMInformationItemImpl.java?rev=1700367&r1=1700366&r2=1700367&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMInformationItemImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMInformationItemImpl.java
Mon Aug 31 22:44:25 2015
@@ -18,13 +18,7 @@
*/
package org.apache.axiom.om.impl.llom;
-import org.apache.axiom.om.OMCloneOptions;
-import org.apache.axiom.om.OMInformationItem;
import org.apache.axiom.om.impl.common.AxiomInformationItem;
-import org.apache.axiom.om.impl.common.Policies;
public abstract class OMInformationItemImpl implements AxiomInformationItem {
- public final OMInformationItem clone(OMCloneOptions options) {
- return (OMInformationItem)coreClone(Policies.CLONE_POLICY, options);
- }
}
