You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by er...@apache.org on 2004/01/26 19:48:10 UTC
cvs commit: xml-xmlbeans/v2/src/xmlstore/org/apache/xmlbeans/impl/store Root.java Saver.java
ericvas 2004/01/26 10:48:10
Modified: v2/src/xmlstore/org/apache/xmlbeans/impl/store Root.java
Saver.java
Log:
Integrating v1 changes to v2
Revision Changes Path
1.5 +9 -1 xml-xmlbeans/v2/src/xmlstore/org/apache/xmlbeans/impl/store/Root.java
Index: Root.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/xmlstore/org/apache/xmlbeans/impl/store/Root.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Root.java 16 Dec 2003 22:00:50 -0000 1.4
+++ Root.java 26 Jan 2004 18:48:10 -0000 1.5
@@ -1796,7 +1796,12 @@
}
case Node.ELEMENT_NODE :
{
- context.begin( n.getLocalName(), n.getNamespaceURI() );
+ String localName = n.getLocalName();
+
+ if (localName == null)
+ localName = n.getNodeName();
+
+ context.begin( localName, n.getNamespaceURI() );
NamedNodeMap attrs = n.getAttributes();
@@ -1808,6 +1813,9 @@
String local = a.getLocalName();
String value = a.getNodeValue();
+ if (local == null)
+ local = a.getNodeName();
+
if (uri != null && uri.equals( _xmlnsUri ))
{
if (local.equals( "xmlns" ))
1.5 +1 -1 xml-xmlbeans/v2/src/xmlstore/org/apache/xmlbeans/impl/store/Saver.java
Index: Saver.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/xmlstore/org/apache/xmlbeans/impl/store/Saver.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Saver.java 22 Jan 2004 21:20:39 -0000 1.4
+++ Saver.java 26 Jan 2004 18:48:10 -0000 1.5
@@ -4609,7 +4609,7 @@
c.getCpForPos( r, 1 ), c.getCchValue() );
}
- if (text != null && _currentNode != _doc)
+ if (text != null)
e.insertBefore( _doc.createTextNode( text ), null );
}
else
---------------------------------------------------------------------
To unsubscribe, e-mail: xmlbeans-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xmlbeans-cvs-help@xml.apache.org