[Dotgnu-pnet-commits] CVS: pnetlib/System.Xml XmlNamespaceManager.cs,1.4,1.5

[Rhys Weatherley <address@hidden>]

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

Modified Files:
        XmlNamespaceManager.cs 
Log Message:


Test cases and bug fixes for "XmlNamespaceManager".


Index: XmlNamespaceManager.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Xml/XmlNamespaceManager.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** XmlNamespaceManager.cs      26 Jul 2002 09:16:36 -0000      1.4
--- XmlNamespaceManager.cs      2 Dec 2002 04:42:15 -0000       1.5
***************
*** 80,85 ****
                                        throw new ArgumentNullException("uri");
                                }
!                               else if(((Object)prefix) == xmlCompareQuick ||
!                                       ((Object)prefix) == xmlNsCompareQuick)
                                {
                                        throw new ArgumentException
--- 80,87 ----
                                        throw new ArgumentNullException("uri");
                                }
!                               prefix = nameTable.Add(prefix);
!                               uri = nameTable.Add(uri);
!                               if(((Object)prefix) == xmlCompareQuick ||
!                              ((Object)prefix) == xmlNsCompareQuick)
                                {
                                        throw new ArgumentException
***************
*** 87,94 ****
                                }
  
-                               // Map the names into the name table.
-                               prefix = nameTable.Add(prefix);
-                               uri = nameTable.Add(uri);
- 
                                // See if we already have this prefix in the 
current scope.
                                NamespaceInfo info = namespaces;
--- 89,92 ----
***************
*** 115,119 ****
                                while(info != null)
                                {
!                                       if(info.prefix != null)
                                        {
                                                list.Add(info.prefix, null);
--- 113,118 ----
                                while(info != null)
                                {
!                                       if(info.prefix != null &&
!                                          !list.Contains(info.prefix))
                                        {
                                                list.Add(info.prefix, null);
***************
*** 121,125 ****
                                        info = info.next;
                                }
!                               list.Add(String.Empty, null);
                                return list.Keys.GetEnumerator();
                        }
--- 120,127 ----
                                        info = info.next;
                                }
!                               if(!list.Contains(String.Empty))
!                               {
!                                       list.Add(String.Empty, null);
!                               }
                                return list.Keys.GetEnumerator();
                        }
***************
*** 306,309 ****
--- 308,315 ----
                                                }
                                                return;
+                                       }
+                                       else
+                                       {
+                                               info = info.next;
                                        }
                                }