svn commit: r1325440 - in /webservices/axiom/branches/AXIOM-412: ./ modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/ modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/ modules/axiom-dom/src/main/java/org/apache...

[ve...@apache.org]

Author: veithen
Date: Thu Apr 12 18:45:16 2012
New Revision: 1325440

URL: http://svn.apache.org/viewvc?rev=1325440&view=rev
Log:
Merged latest changes from trunk.

Added:
    webservices/axiom/branches/AXIOM-412/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestCloneNodeWithAttributes.java
      - copied unchanged from r1325439, webservices/commons/trunk/modules/axiom/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestCloneNodeWithAttributes.java
Modified:
    webservices/axiom/branches/AXIOM-412/   (props changed)
    webservices/axiom/branches/AXIOM-412/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestSuiteBuilder.java
    webservices/axiom/branches/AXIOM-412/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttributeMap.java

Propchange: webservices/axiom/branches/AXIOM-412/
------------------------------------------------------------------------------
  Merged /webservices/commons/trunk/modules/axiom:r1325131-1325439

Modified: webservices/axiom/branches/AXIOM-412/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-412/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestSuiteBuilder.java?rev=1325440&r1=1325439&r2=1325440&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-412/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestSuiteBuilder.java (original)
+++ webservices/axiom/branches/AXIOM-412/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestSuiteBuilder.java Thu Apr 12 18:45:16 2012
@@ -60,6 +60,8 @@ public class DOMTestSuiteBuilder extends
         addTest(new org.apache.axiom.ts.dom.element.TestAttributes3(dbf));
         addTest(new org.apache.axiom.ts.dom.element.TestAttributes4(dbf));
         addTest(new org.apache.axiom.ts.dom.element.TestCloneNode(dbf));
+        addTest(new org.apache.axiom.ts.dom.element.TestCloneNodeWithAttributes(dbf, true));
+        addTest(new org.apache.axiom.ts.dom.element.TestCloneNodeWithAttributes(dbf, false));
         addTest(new org.apache.axiom.ts.dom.element.TestGetElementsByTagName(dbf));
         addTest(new org.apache.axiom.ts.dom.element.TestGetElementsByTagNameNS(dbf));
         addTest(new org.apache.axiom.ts.dom.element.TestGetElementsByTagNameRecursive(dbf));

Modified: webservices/axiom/branches/AXIOM-412/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttributeMap.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-412/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttributeMap.java?rev=1325440&r1=1325439&r2=1325440&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-412/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttributeMap.java (original)
+++ webservices/axiom/branches/AXIOM-412/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttributeMap.java Thu Apr 12 18:45:16 2012
@@ -29,7 +29,7 @@ import java.util.Vector;
 public class AttributeMap implements NamedNodeMap {
     private Vector nodes;
 
-    private ParentNode ownerNode;
+    private ElementImpl ownerNode;
 
     //
     // Data
@@ -41,7 +41,7 @@ public class AttributeMap implements Nam
 
     private final static short HASDEFAULTS = 0x1 << 2;
                             
-    AttributeMap(ParentNode ownerNode) {
+    AttributeMap(ElementImpl ownerNode) {
         this.ownerNode = ownerNode;
     }
 
@@ -231,8 +231,8 @@ public class AttributeMap implements Nam
      * the nodes contained in the map.
      */
 
-    public AttributeMap cloneMap(NodeImpl ownerNode) {
-        AttributeMap newmap = new AttributeMap((ParentNode) ownerNode);
+    public AttributeMap cloneMap(ElementImpl ownerNode) {
+        AttributeMap newmap = new AttributeMap(ownerNode);
         newmap.hasDefaults(hasDefaults());
         newmap.cloneContent(this);
         return newmap;
@@ -249,10 +249,11 @@ public class AttributeMap implements Nam
                 }
                 nodes.setSize(size);
                 for (int i = 0; i < size; ++i) {
-                    NodeImpl n = (NodeImpl) srcnodes.elementAt(i);
-                    NodeImpl clone = (NodeImpl) n.cloneNode(true);
+                    AttrImpl n = (AttrImpl) srcnodes.elementAt(i);
+                    AttrImpl clone = (AttrImpl) n.cloneNode(true);
                     clone.isSpecified(n.isSpecified());
                     nodes.setElementAt(clone, i);
+                    clone.setOwnerElement(ownerNode);
                 }
             }
         }