svn commit: r1714139 - in /webservices/axiom/trunk/aspects: core-aspects/src/main/java/org/apache/axiom/core/ dom-aspects/src/main/java/org/apache/axiom/dom/ om-aspects/src/main/java/org/apache/axiom/om/impl/common/

[ve...@apache.org]

Author: veithen
Date: Thu Nov 12 23:21:51 2015
New Revision: 1714139

URL: http://svn.apache.org/viewvc?rev=1714139&view=rev
Log:
Reorganize the DetachPolicy implementations.

Modified:
    webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/DetachPolicy.java
    webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/Policies.java
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/Policies.java

Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/DetachPolicy.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/DetachPolicy.java?rev=1714139&r1=1714138&r2=1714139&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/DetachPolicy.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/DetachPolicy.java Thu Nov 12 23:21:51 2015
@@ -22,12 +22,18 @@ package org.apache.axiom.core;
  * Determines how nodes are detached from an object model tree.
  */
 public interface DetachPolicy {
-    public static final DetachPolicy NEW_DOCUMENT = new DetachPolicy() {
+    DetachPolicy NEW_DOCUMENT = new DetachPolicy() {
         public CoreDocument getNewOwnerDocument(CoreParentNode owner) {
             return null;
         }
     };
     
+    DetachPolicy SAME_DOCUMENT = new DetachPolicy() {
+        public CoreDocument getNewOwnerDocument(CoreParentNode owner) {
+            return owner.coreGetOwnerDocument(true);
+        }
+    };
+    
     /**
      * Get the new owner document for the node (or group of child nodes) to be detached. This method
      * is called before any node is detached.

Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/Policies.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/Policies.java?rev=1714139&r1=1714138&r2=1714139&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/Policies.java (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/Policies.java Thu Nov 12 23:21:51 2015
@@ -21,11 +21,9 @@ package org.apache.axiom.dom;
 import org.apache.axiom.core.AttributeMatcher;
 import org.apache.axiom.core.ClonePolicy;
 import org.apache.axiom.core.CoreAttribute;
-import org.apache.axiom.core.CoreDocument;
 import org.apache.axiom.core.CoreElement;
 import org.apache.axiom.core.CoreNSUnawareAttribute;
 import org.apache.axiom.core.CoreNode;
-import org.apache.axiom.core.CoreParentNode;
 import org.apache.axiom.core.DetachPolicy;
 import org.apache.axiom.core.NSAwareAttributeMatcher;
 import org.apache.axiom.core.NamespaceDeclarationMatcher;
@@ -34,11 +32,7 @@ import org.apache.axiom.core.NodeType;
 public final class Policies {
     private Policies() {}
     
-    public static final DetachPolicy DETACH_POLICY = new DetachPolicy() {
-        public CoreDocument getNewOwnerDocument(CoreParentNode owner) {
-            return owner.coreGetOwnerDocument(true);
-        }
-    };
+    public static final DetachPolicy DETACH_POLICY = DetachPolicy.SAME_DOCUMENT;
     
     /**
      * {@link AttributeMatcher} implementation that matches attributes based on their name, i.e.

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/Policies.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/Policies.java?rev=1714139&r1=1714138&r2=1714139&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/Policies.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/Policies.java Thu Nov 12 23:21:51 2015
@@ -21,9 +21,7 @@ package org.apache.axiom.om.impl.common;
 import org.apache.axiom.core.AttributeMatcher;
 import org.apache.axiom.core.ClonePolicy;
 import org.apache.axiom.core.CoreAttribute;
-import org.apache.axiom.core.CoreDocument;
 import org.apache.axiom.core.CoreNode;
-import org.apache.axiom.core.CoreParentNode;
 import org.apache.axiom.core.DetachPolicy;
 import org.apache.axiom.core.NSAwareAttributeMatcher;
 import org.apache.axiom.core.NamespaceDeclarationMatcher;
@@ -36,11 +34,7 @@ import org.apache.axiom.om.impl.intf.Axi
 public final class Policies {
     private Policies() {}
     
-    public static final DetachPolicy DETACH_POLICY = new DetachPolicy() {
-        public CoreDocument getNewOwnerDocument(CoreParentNode owner) {
-            return null;
-        }
-    };
+    public static final DetachPolicy DETACH_POLICY = DetachPolicy.NEW_DOCUMENT;
     
     public static final AttributeMatcher ATTRIBUTE_MATCHER = new NSAwareAttributeMatcher(
             DETACH_POLICY,