Author: arina
Date: 2008-02-18 05:37:44 -0500 (Mon, 18 Feb 2008)
New Revision: 96041
Modified:
branches/mainsoft/gh2.2/mcs/class/System.XML/Mono.Xml.Xsl/ChangeLog
branches/mainsoft/gh2.2/mcs/class/System.XML/Mono.Xml.Xsl/GenericOutputter.cs
branches/mainsoft/gh2.2/mcs/class/System.XML/System.Xml/ChangeLog
branches/mainsoft/gh2.2/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs
Log:
Fix for the standalone tests: attribset_attribset24 and attribset_attribset40.
Modified: branches/mainsoft/gh2.2/mcs/class/System.XML/Mono.Xml.Xsl/ChangeLog
===================================================================
--- branches/mainsoft/gh2.2/mcs/class/System.XML/Mono.Xml.Xsl/ChangeLog
2008-02-18 10:32:15 UTC (rev 96040)
+++ branches/mainsoft/gh2.2/mcs/class/System.XML/Mono.Xml.Xsl/ChangeLog
2008-02-18 10:37:44 UTC (rev 96041)
@@ -1,3 +1,7 @@
+2008-02-18 Arina Itkes <[EMAIL PROTECTED]>
+
+ * GenericOutputter.cs: Removed unnecessary namespace update.
+
2008-01-08 Atsushi Enomoto <[EMAIL PROTECTED]>
* XslKey.cs, XslStylesheet.cs, Compiler.cs : XSLT 1.0 does not
Modified:
branches/mainsoft/gh2.2/mcs/class/System.XML/Mono.Xml.Xsl/GenericOutputter.cs
===================================================================
---
branches/mainsoft/gh2.2/mcs/class/System.XML/Mono.Xml.Xsl/GenericOutputter.cs
2008-02-18 10:32:15 UTC (rev 96040)
+++
branches/mainsoft/gh2.2/mcs/class/System.XML/Mono.Xml.Xsl/GenericOutputter.cs
2008-02-18 10:37:44 UTC (rev 96041)
@@ -198,8 +198,6 @@
// for non-local
attributes.
prefix = "xp_" +
_xpCount++;
if (existing != prefix) {
- while
(_nsManager.LookupNamespace (prefix) != null)
- prefix = "xp_"
+ _xpCount++;
newNamespaces.Add
(prefix);
_currentNamespaceDecls.Add (prefix, attr.Namespace);
_nsManager.AddNamespace
(prefix, attr.Namespace);
Modified: branches/mainsoft/gh2.2/mcs/class/System.XML/System.Xml/ChangeLog
===================================================================
--- branches/mainsoft/gh2.2/mcs/class/System.XML/System.Xml/ChangeLog
2008-02-18 10:32:15 UTC (rev 96040)
+++ branches/mainsoft/gh2.2/mcs/class/System.XML/System.Xml/ChangeLog
2008-02-18 10:37:44 UTC (rev 96041)
@@ -1,3 +1,8 @@
+2008-02-18 Arina Itkes <[EMAIL PROTECTED]>
+
+ * XmlNamespaceManager.cs: If there is a not empty prefix for
+ a namespace it should be returned.
+
2008-01-25 Atsushi Enomoto <[EMAIL PROTECTED]>
* XmlReader.cs : MoveToNextSibling() should check EOF (as Skip() does
Modified:
branches/mainsoft/gh2.2/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs
===================================================================
---
branches/mainsoft/gh2.2/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs
2008-02-18 10:32:15 UTC (rev 96040)
+++
branches/mainsoft/gh2.2/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs
2008-02-18 10:37:44 UTC (rev 96041)
@@ -334,9 +334,6 @@
if (uri == null)
return null;
- if (CompareString (uri, DefaultNamespace, atomizedName))
- return string.Empty;
-
if (CompareString (uri, XmlnsXml, atomizedName))
return PrefixXml;
@@ -348,6 +345,9 @@
if (!excludeOverriden || !IsOverriden
(i))
return decls [i].Prefix;
}
+
+ if (CompareString (uri, DefaultNamespace, atomizedName))
+ return string.Empty;
// ECMA specifies that this method returns String.Empty
// in case of no match. But actually MS.NET returns
null.
_______________________________________________
Mono-patches maillist - Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches
