[mvp-xml-cvs] XPointer/v2/src XPointerReader.cs,1.4,1.5

[Oleg T. <he...@us...>]

Update of /cvsroot/mvp-xml/XPointer/v2/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30165/v2/src

Modified Files:
	XPointerReader.cs 
Log Message:


Index: XPointerReader.cs
===================================================================
RCS file: /cvsroot/mvp-xml/XPointer/v2/src/XPointerReader.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- XPointerReader.cs	28 Oct 2005 21:51:34 -0000	1.4
+++ XPointerReader.cs	29 Oct 2005 11:44:32 -0000	1.5
@@ -8,6 +8,7 @@
 using System.Collections.Generic;
 
 using Mvp.Xml.Common.XPath;
+using Mvp.Xml.Common;
 
 #endregion
 
@@ -42,7 +43,7 @@
       _pointedNodes = pointer.Evaluate(nav);
       //There is always at least one identified node
       //XPathNodeIterator is already at the first node
-      _reader = _pointedNodes.Current.ReadSubtree();
+      _reader = new SubtreeXPathNavigator(_pointedNodes.Current).ReadSubtree();
     }
 
     private XPathDocument CreateAndCacheDocument(XmlReader r)
@@ -83,19 +84,19 @@
     /// Creates <c>XPointerReader</c> instance with given uri and xpointer.
     /// </summary>	    
     public XPointerReader(string uri, string xpointer)
-      : this(new XmlTextReader(uri), xpointer) { }
+      : this(new XmlBaseAwareXmlTextReader(uri), xpointer) { }
 
     /// <summary>
     /// Creates <c>XPointerReader</c> instance with given uri, nametable and xpointer.
     /// </summary>	    
     public XPointerReader(string uri, XmlNameTable nt, string xpointer)
-      : this(new XmlTextReader(uri, nt), xpointer) { }    
+      : this(new XmlBaseAwareXmlTextReader(uri, nt), xpointer) { }    
 
     /// <summary>
     /// Creates <c>XPointerReader</c> instance with given uri, stream, nametable and xpointer.
     /// </summary>	    
     public XPointerReader(string uri, Stream stream, XmlNameTable nt, string xpointer)
-      : this(new XmlTextReader(uri, stream, nt), xpointer) { }    
+      : this(new XmlBaseAwareXmlTextReader(uri, stream, nt), xpointer) { }    
 
     /// <summary>
     /// Creates <c>XPointerReader</c> instance with given uri, stream and xpointer.
@@ -145,8 +146,8 @@
         }
         else
         {
-            //Not cached or GCollected            
-            XmlReader r = XmlReader.Create(new StringReader(content), null, uri);
+            //Not cached or GCollected                        
+            XmlReader r = new XmlBaseAwareXmlTextReader(uri, new StringReader(content));
             doc = CreateAndCacheDocument(r);
         }               
         Init(doc.CreateNavigator(), xpointer);
@@ -389,7 +390,7 @@
       {
         if (_pointedNodes.MoveNext())
         {
-          _reader = _pointedNodes.Current.ReadSubtree();
+          _reader = new SubtreeXPathNavigator(_pointedNodes.Current).ReadSubtree();
           return _reader.Read();
         }
       }