svn commit: r962560 - /xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Xobj.java

[ce...@apache.org]

Author: cezar
Date: Fri Jul  9 15:38:11 2010
New Revision: 962560

URL: http://svn.apache.org/viewvc?rev=962560&view=rev
Log:
Fix to preserve the CDATA bookmarks when copy from one xmlobject to another.

Modified:
    xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Xobj.java

Modified: xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Xobj.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Xobj.java?rev=962560&r1=962559&r2=962560&view=diff
==============================================================================
--- xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Xobj.java (original)
+++ xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Xobj.java Fri Jul  9 15:38:11 2010
@@ -15,6 +15,7 @@
 
 package org.apache.xmlbeans.impl.store;
 
+import org.apache.xmlbeans.CDataBookmark;
 import org.w3c.dom.Attr;
 import org.w3c.dom.CDATASection;
 import org.w3c.dom.CharacterData;
@@ -1118,6 +1119,11 @@ abstract class Xobj implements TypeStore
             newX._offAfter = x._offAfter;
             newX._cchAfter = x._cchAfter;
 
+            for ( Bookmark b = x._bookmarks; b != null ; b = b._next )
+            {
+               if ( x.hasBookmark( CDataBookmark.CDATA_BOOKMARK.getKey(), b._pos) )
+                   newX.setBookmark(b._pos, CDataBookmark.CDATA_BOOKMARK.getKey(), CDataBookmark.CDATA_BOOKMARK);
+            }
             // TODO - strange to have charNode stuff inside here .....
            // newX._charNodesValue = CharNode.copyNodes( x._charNodesValue, newX._srcValue );
            // newX._charNodesAfter = CharNode.copyNodes( x._charNodesAfter, newX._srcAfter );



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org