Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java?rev=1714454&r1=1714453&r2=1714454&view=diff ============================================================================== --- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java (original) +++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java Sun Nov 15 13:59:31 2015 @@ -43,7 +43,7 @@ import org.apache.axiom.om.impl.OMContai import org.apache.axiom.om.impl.builder.OMFactoryEx; import org.apache.axiom.om.impl.builder.StAXOMBuilder; import org.apache.axiom.om.impl.common.OMNamespaceImpl; -import org.apache.axiom.om.impl.common.Policies; +import org.apache.axiom.om.impl.common.AxiomSemantics; import org.apache.axiom.om.impl.intf.AxiomAttribute; import org.apache.axiom.om.impl.intf.AxiomCDATASection; import org.apache.axiom.om.impl.intf.AxiomCharacterDataNode; @@ -136,7 +136,7 @@ public class OMFactoryImpl implements OM if (parent != null) { ((OMContainerEx)parent).addChild(node, fromBuilder); } - node.coreSetCharacterData(content, Policies.DETACH_POLICY); + node.coreSetCharacterData(content, AxiomSemantics.INSTANCE); return node; } @@ -186,7 +186,7 @@ public class OMFactoryImpl implements OM public final OMText createOMText(OMContainer parent, OMText source) { // TODO: this doesn't necessarily produce a node with the expected OMFactory - return (AxiomText)((AxiomText)source).coreClone(Policies.CLONE_POLICY, null, (AxiomContainer)parent); + return (AxiomText)((AxiomText)source).coreClone(AxiomSemantics.CLONE_POLICY, null, (AxiomContainer)parent); } public final OMText createOMText(Object dataHandler, boolean optimize) { @@ -210,7 +210,7 @@ public class OMFactoryImpl implements OM OMContainer parent, String piTarget, String piData, boolean fromBuilder) { AxiomProcessingInstruction node = createNode(AxiomProcessingInstruction.class); node.coreSetTarget(piTarget); - node.coreSetCharacterData(piData, Policies.DETACH_POLICY); + node.coreSetCharacterData(piData, AxiomSemantics.INSTANCE); if (parent != null) { ((OMContainerEx)parent).addChild(node, fromBuilder); } @@ -237,7 +237,7 @@ public class OMFactoryImpl implements OM public final OMComment createOMComment(OMContainer parent, String content, boolean fromBuilder) { AxiomComment node = createNode(AxiomComment.class); - node.coreSetCharacterData(content, Policies.DETACH_POLICY); + node.coreSetCharacterData(content, AxiomSemantics.INSTANCE); if (parent != null) { ((OMContainerEx)parent).addChild(node, fromBuilder); } @@ -357,7 +357,7 @@ public class OMFactoryImpl implements OM } AxiomAttribute attr = createNode(AxiomAttribute.class); attr.internalSetLocalName(localName); - attr.coreSetCharacterData(value, Policies.DETACH_POLICY); + attr.coreSetCharacterData(value, AxiomSemantics.INSTANCE); attr.internalSetNamespace(ns); attr.coreSetType(OMConstants.XMLATTRTYPE_CDATA); return attr;
Modified: webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java?rev=1714454&r1=1714453&r2=1714454&view=diff ============================================================================== --- webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java (original) +++ webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java Sun Nov 15 13:59:31 2015 @@ -24,7 +24,7 @@ import static org.apache.axiom.dom.DOMEx import org.apache.axiom.core.CoreChildNode; import org.apache.axiom.core.CoreDocumentFragment; import org.apache.axiom.dom.DOMParentNode; -import org.apache.axiom.dom.Policies; +import org.apache.axiom.dom.DOMSemantics; import org.w3c.dom.DOMException; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -106,7 +106,7 @@ public abstract class ParentNode extends } checkNewChild(newChild, _oldChild); CoreChildNode nextSibling = oldChild.coreGetNextSibling(); - oldChild.coreDetach(Policies.DETACH_POLICY); + oldChild.coreDetach(DOMSemantics.INSTANCE); if (newChild instanceof CoreChildNode) { if (nextSibling == null) { coreAppendChild((CoreChildNode)newChild, false); Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java?rev=1714454&r1=1714453&r2=1714454&view=diff ============================================================================== --- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java (original) +++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java Sun Nov 15 13:59:31 2015 @@ -62,8 +62,8 @@ import org.apache.axiom.core.ElementMatc import org.apache.axiom.fom.AbderaElement; import org.apache.axiom.fom.FOMExceptionTranslator; import org.apache.axiom.fom.FOMList; +import org.apache.axiom.fom.FOMSemantics; import org.apache.axiom.fom.IRIUtil; -import org.apache.axiom.fom.Policies; import org.apache.axiom.om.OMAttribute; import org.apache.axiom.om.OMComment; import org.apache.axiom.om.OMContainer; @@ -216,9 +216,9 @@ public class FOMElement extends FOMChild public <T extends Element> T setAttributeValue(QName qname, String value) { if (value == null) { - coreRemoveAttribute(Policies.ATTRIBUTE_MATCHER, qname.getNamespaceURI(), qname.getLocalPart(), Policies.DETACH_POLICY); + coreRemoveAttribute(FOMSemantics.ATTRIBUTE_MATCHER, qname.getNamespaceURI(), qname.getLocalPart(), FOMSemantics.INSTANCE); } else { - coreSetAttribute(Policies.ATTRIBUTE_MATCHER, qname.getNamespaceURI(), qname.getLocalPart(), qname.getPrefix(), value); + coreSetAttribute(FOMSemantics.ATTRIBUTE_MATCHER, qname.getNamespaceURI(), qname.getLocalPart(), qname.getPrefix(), value); } return (T)this; } @@ -226,7 +226,7 @@ public class FOMElement extends FOMChild public final Iterator<AbderaElement> _getChildrenWithName(QName qname) { return coreGetElements(Axis.CHILDREN, AbderaElement.class, ElementMatcher.BY_QNAME, qname.getNamespaceURI(), qname.getLocalPart(), FOMExceptionTranslator.INSTANCE, - Policies.DETACH_POLICY); + FOMSemantics.INSTANCE); } public <E extends Element> List<E> _getChildrenAsSet(QName qname) { @@ -254,9 +254,9 @@ public class FOMElement extends FOMChild if (e == null && element != null) { coreAppendChild((AbderaElement)element, false); } else if (e != null && element != null) { - e.coreReplaceWith((AbderaElement)element, Policies.DETACH_POLICY); + e.coreReplaceWith((AbderaElement)element, FOMSemantics.INSTANCE); } else if (e != null && element == null) { - e.coreDetach(Policies.DETACH_POLICY); + e.coreDetach(FOMSemantics.INSTANCE); } } @@ -453,7 +453,7 @@ public class FOMElement extends FOMChild if (element.coreGetLocalName().equals(qname.getLocalPart()) && element.coreGetNamespaceURI().equals(qname.getNamespaceURI())) { child = child.coreGetNextSibling(); - element.coreDetach(Policies.DETACH_POLICY); + element.coreDetach(FOMSemantics.INSTANCE); if (many) { continue; } else {
