Author: atsushi
Date: 2006-11-01 20:50:30 -0500 (Wed, 01 Nov 2006)
New Revision: 67251
Modified:
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs
Log:
2006-11-02 Atsushi Enomoto <[EMAIL PROTECTED]>
* XmlSchemaImporter.cs : initialize extensions from configuration.
Modified:
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
===================================================================
--- branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
2006-11-02 00:13:14 UTC (rev 67250)
+++ branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
2006-11-02 01:50:30 UTC (rev 67251)
@@ -1,3 +1,7 @@
+2006-11-02 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * XmlSchemaImporter.cs : initialize extensions from configuration.
+
2006-11-01 Atsushi Enomoto <[EMAIL PROTECTED]>
* SchemaImporterExtension.cs,
Modified:
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs
===================================================================
---
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs
2006-11-02 00:13:14 UTC (rev 67250)
+++
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs
2006-11-02 01:50:30 UTC (rev 67251)
@@ -35,6 +35,10 @@
#endif
using System.Xml.Schema;
using System.Collections;
+#if NET_2_0 && CONFIGURATION_DEP
+using System.Configuration;
+using System.Xml.Serialization.Configuration;
+#endif
namespace System.Xml.Serialization
{
@@ -84,6 +88,8 @@
{
this.schemas = schemas;
typeIdentifiers = new CodeIdentifiers ();
+
+ InitializeExtensions ();
}
public XmlSchemaImporter (XmlSchemas schemas, CodeIdentifiers
typeIdentifiers)
@@ -105,6 +111,8 @@
}
else
typeIdentifiers = new CodeIdentifiers ();
+
+ InitializeExtensions ();
}
#endif
@@ -118,6 +126,8 @@
}
else
typeIdentifiers = new CodeIdentifiers ();
+
+ InitializeExtensions ();
}
@@ -126,6 +136,8 @@
this.typeIdentifiers = typeIdentifiers;
this.schemas = schemas;
this.options = options;
+
+ InitializeExtensions ();
}
void InitSharedData (ImportContext context)
@@ -148,6 +160,19 @@
#region Methods
+ void InitializeExtensions ()
+ {
+#if NET_2_0 && CONFIGURATION_DEP
+ SerializationSectionGroup root =
ConfigurationManager.GetSection ("system.xml.serialization") as
SerializationSectionGroup;
+ if (root == null)
+ return;
+
+ foreach (SchemaImporterExtensionElement element in
+
root.SchemaImporterExtensions.SchemaImporterExtensions)
+ Extensions.Add (element.Name, element.Type);
+#endif
+ }
+
public XmlMembersMapping ImportAnyType (XmlQualifiedName
typeName, string elementName)
{
if (typeName == XmlQualifiedName.Empty)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches