[Dotgnu-pnet-commits] CVS: pnetlib/System.Xml XmlTextReader.cs,1.35,1.36

[Adam Ballai <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/System.Xml
In directory subversions:/tmp/cvs-serv14896/System.Xml

Modified Files:
        XmlTextReader.cs 
Log Message:
Fix for apostrophes in Values and few more methods implemented.

Index: XmlTextReader.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Xml/XmlTextReader.cs,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** XmlTextReader.cs    24 Feb 2003 00:29:46 -0000      1.35
--- XmlTextReader.cs    5 Mar 2003 12:42:47 -0000       1.36
***************
*** 190,194 ****
                                {
                                        baseURI = String.Empty;
!                                       // TODO: find byte order mark
                                        // else ...
                                        // encoding = 
System.Text.UT8Encoding(true);
--- 190,199 ----
                                {
                                        baseURI = String.Empty;
!                                       // TODO: find byte order mark 
!                                       // // EF BB BF = utf8
!                                       // // FE FF = utf16/ucs-2 little endian
!                                       // // FF FE = utf16/ucs-2, big endian
!                                       // // FF FE 00 00 = UTF-32/ucs-4, 
little endian
!                                       // // 00 00 FE FF = UTC-32/UCS-4, big 
endian
                                        // else ...
                                        // encoding = 
System.Text.UT8Encoding(true);
***************
*** 273,280 ****
  
        // Clean up the resources that were used by this XML reader.
-       [TODO]
        public override void Close()
                        {
!                               // TODO
                        }
  
--- 278,296 ----
  
        // Clean up the resources that were used by this XML reader.
        public override void Close()
                        {
!                               prefix = String.Empty;
!                               localName = String.Empty;
!                               namespaceURI = String.Empty;
!                               value = String.Empty;
!                               attr = new 
XmlAttributeToken(nameTable,null,null);
!                               attributes = new XmlAttributeCollection(attr); 
!                               attributeIndex = -1;
!                               depth = 0;
!                               isEmpty = false;
!                               contextSupport = false;
!                               name = String.Empty;
!                               readAttribute = false;
!                               reader = null;
                        }
  
***************
*** 324,332 ****
  
        // Get the remainder of the the current XML stream.
-       [TODO]
        public TextReader GetRemainder()
                        {
!                               // TODO
!                               return null;
                        }
  
--- 340,352 ----
  
        // Get the remainder of the the current XML stream.
        public TextReader GetRemainder()
                        {
!                               String tmp = reader.ReadToEnd();
!                               Console.WriteLine(tmp);
!                               StringReader s = new StringReader(tmp);
!                               Close();
!                               readState = ReadState.EndOfFile;
!                               
!                               return s;
                        }
  
***************
*** 842,846 ****
                                                builder = new StringBuilder();
                                                break;
!                                       case '\'':      
                                        case '"':
                                                // get quote
--- 862,866 ----
                                                builder = new StringBuilder();
                                                break;
!                                       case '\'':
                                        case '"':
                                                // get quote
***************
*** 848,854 ****
                                                if(nodeType != 
XmlNodeType.Attribute)
                                                {
!                                                       throw new XmlException
!                                                               
(S._("Xml_WrongNode"));
                                                }
                                                // Get Text value of an 
Attribute       
                                                while((ch = ReadChar()) != -1)
--- 868,876 ----
                                                if(nodeType != 
XmlNodeType.Attribute)
                                                {
!                                                       
builder.Append((char)ch);
!                                                       AnalyzeChar(ReadChar(), 
false);
!                                                       return; 
                                                }
+                                               
                                                // Get Text value of an 
Attribute       
                                                while((ch = ReadChar()) != -1)