diff options
| author | Gert Driesen <drieseng@users.sourceforge.net> | 2005-08-03 21:39:08 +0400 |
|---|---|---|
| committer | Gert Driesen <drieseng@users.sourceforge.net> | 2005-08-03 21:39:08 +0400 |
| commit | b6157808b4b180f0c64f6c1bd568d76e2d8aaf6c (patch) | |
| tree | 2ba26ad796f511d519b33d6ecd2242659348e374 /mcs/class/System.XML/Mono.Xml.Schema | |
| parent | eb614c78d95174b01a914ac796bb9d91faf46887 (diff) | |
* XmlSchemaInference.cs: Is sealed in Beta 2.
* XmlSchemaInfo.cs: Added ContentType property.
* XmlSchemaObjectEnumerator.cs: No longer sealed in Beta 2.
* XmlSchemaSet.cs: No longer sealed in Beta 2. XmlResolver property
is now CLSCompliant.
* XmlConvert.cs: Renamed RoundTripKind to RoundtripKind.
* XmlDateTimeSerializationMode.cs: Renamed RoundTripKind to RoundtripKind
to match .NET 2.0 Beta 2.
* XmlNodeReader2.cs: GetNamespacesInScope returns generic IDictionary
in .NET 2.0 Beta 2, and is explicit interface implementation.
* XmlTextReader.cs: GetNamespacesInScope returns generic IDictionary
in .NET 2.0 Beta 2.
* XmlTextReader2.cs: GetNamespacesInScope returns generic IDictionary
in .NET 2.0 Beta 2.
* XmlValidatingReader.cs: GetNamespacesInScope returns generic IDictionary
in .NET 2.0 Beta 2.
* IXmlNamespaceResolver.cs: GetNamespacesInScope returns generic IDictionary
in .NET 2.0 Beta 2.
* XmlNamespaceManager.cs: GetNamespacesInScope returns generic IDictionary
in .NET 2.0 Beta 2.
* XmlNodeReaderImpl.cs: GetNamespacesInScope returns generic IDictionary in
.NET 2.0 Beta 2.
* DTDValidatingReader.cs: GetNamespacesInScope returns generic IDictionary
in .NET 2.0 Beta 2.
* XsltArgumentList.cs: No longer sealed in .NET 2.0.
* XsltException.cs: Message override is back in .NET 2.0 Beta 2.
* XmlMapping.cs: API compatibility fixes. Ctor is not protected in .NET 1.1.
SetKey is not obsolete in .NET 2.0 Beta 2.
* XPathNavigator.cs: GetNamespacesInScope returns generic IDictionary
in .NET 2.0 Beta 2.
* XsdValidationReader.cs: GetNamespacesInScope returns generic IDictionary
in .NET 2.0 Beta 2.
* XmlSchemaValidatingReader.cs: GetNamespacesInScope returns generic
IDictionary in .NET 2.0 Beta 2.
* SubtreeXmlReader.cs: GetNamespacesInScope now returns generic IDictionary.
svn path=/trunk/mcs/; revision=47974
Diffstat (limited to 'mcs/class/System.XML/Mono.Xml.Schema')
3 files changed, 18 insertions, 2 deletions
diff --git a/mcs/class/System.XML/Mono.Xml.Schema/ChangeLog b/mcs/class/System.XML/Mono.Xml.Schema/ChangeLog index d69d616e527..9455b93d92d 100644 --- a/mcs/class/System.XML/Mono.Xml.Schema/ChangeLog +++ b/mcs/class/System.XML/Mono.Xml.Schema/ChangeLog @@ -1,3 +1,10 @@ +2005-08-03 Gert Driesen <drieseng@users.sourceforge.net> + + * XsdValidationReader.cs: GetNamespacesInScope returns generic + IDictionary in .NET 2.0 Beta 2. + * XmlSchemaValidatingReader.cs: GetNamespacesInScope returns generic + IDictionary in .NET 2.0 Beta 2. + 2005-07-28 Atsushi Enomoto <atsushi@ximian.com> * XsdValidatingReader.cs : when xsi:schemaLocation could not be diff --git a/mcs/class/System.XML/Mono.Xml.Schema/XmlSchemaValidatingReader.cs b/mcs/class/System.XML/Mono.Xml.Schema/XmlSchemaValidatingReader.cs index 51b9b08319c..22906d8d664 100644 --- a/mcs/class/System.XML/Mono.Xml.Schema/XmlSchemaValidatingReader.cs +++ b/mcs/class/System.XML/Mono.Xml.Schema/XmlSchemaValidatingReader.cs @@ -40,6 +40,7 @@ using Mono.Xml; #if NET_2_0 +using System.Collections.Generic; using QName = System.Xml.XmlQualifiedName; using Form = System.Xml.Schema.XmlSchemaForm; using Use = System.Xml.Schema.XmlSchemaUse; @@ -280,7 +281,7 @@ namespace Mono.Xml.Schema } } - public IDictionary GetNamespacesInScope (XmlNamespaceScope scope) + public IDictionary<string, string> GetNamespacesInScope (XmlNamespaceScope scope) { IXmlNamespaceResolver resolver = reader as IXmlNamespaceResolver; if (resolver == null) diff --git a/mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs b/mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs index e93720d663a..4355366e729 100644 --- a/mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs +++ b/mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs @@ -29,6 +29,9 @@ // using System; using System.Collections; +#if NET_2_0 +using System.Collections.Generic; +#endif using System.Collections.Specialized; using System.IO; using System.Text; @@ -192,7 +195,12 @@ namespace Mono.Xml.Schema } } - IDictionary IXmlNamespaceResolver.GetNamespacesInScope (XmlNamespaceScope scope) +#if NET_2_0 + IDictionary<string, string> +#else + IDictionary +#endif + IXmlNamespaceResolver.GetNamespacesInScope (XmlNamespaceScope scope) { IXmlNamespaceResolver resolver = reader as IXmlNamespaceResolver; if (resolver == null) |