diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2005-12-08 11:15:30 +0300 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2005-12-08 11:15:30 +0300 |
| commit | 0b4965171dbe9128e65236443a56ec057859ba4b (patch) | |
| tree | 86aeaf638b5b69c1b933a28e5d0be5ecd3090ac7 /mcs/class/System.XML | |
| parent | fbfc34e58512cf1cb084e74c069cc1507d7eb961 (diff) | |
2005-12-08 Atsushi Enomoto <atsushi@ximian.com>
* XmlSchemaSet.cs :
Turned out that it also has set_CompilationSettings.
* XmlSchemaComplexType. : thus CompilationSettings is nullable, we
have to check its existence.
* XmlSchemaSetTests.cs : added set_CompilationSettings tests.
svn path=/trunk/mcs/; revision=54098
Diffstat (limited to 'mcs/class/System.XML')
5 files changed, 15 insertions, 1 deletions
diff --git a/mcs/class/System.XML/System.Xml.Schema/ChangeLog b/mcs/class/System.XML/System.Xml.Schema/ChangeLog index 7d0bd1def42..3c2394acacc 100644 --- a/mcs/class/System.XML/System.Xml.Schema/ChangeLog +++ b/mcs/class/System.XML/System.Xml.Schema/ChangeLog @@ -1,5 +1,12 @@ 2005-12-08 Atsushi Enomoto <atsushi@ximian.com> + * XmlSchemaSet.cs : + Turned out that it also has set_CompilationSettings. + * XmlSchemaComplexType. : thus CompilationSettings is nullable, we + have to check its existence. + +2005-12-08 Atsushi Enomoto <atsushi@ximian.com> + * XmlSchema.cs : Compile() are obsoleted in 2.0. 2005-12-08 Atsushi Enomoto <atsushi@ximian.com> diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaComplexType.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaComplexType.cs index 0807a8c37d0..fb82b06ca5a 100644 --- a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaComplexType.cs +++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaComplexType.cs @@ -600,7 +600,8 @@ namespace System.Xml.Schema }
#if NET_2_0
- if (schema.Schemas.CompilationSettings.EnableUpaCheck)
+ if (schema.Schemas.CompilationSettings != null &&
+ schema.Schemas.CompilationSettings.EnableUpaCheck)
#endif
// This check is optional only after 2.0
contentTypeParticle.ValidateUniqueParticleAttribution (new XmlSchemaObjectTable (),
diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSet.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSet.cs index 99b808d9b8f..8b39ba965a3 100644 --- a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSet.cs +++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSet.cs @@ -121,6 +121,7 @@ namespace System.Xml.Schema public XmlSchemaCompilationSettings CompilationSettings { get { return settings; } + set { settings = value; } } // This is mainly used for event delegating diff --git a/mcs/class/System.XML/Test/System.Xml.Schema/ChangeLog b/mcs/class/System.XML/Test/System.Xml.Schema/ChangeLog index 3bcb2a82eca..005d42464b9 100644 --- a/mcs/class/System.XML/Test/System.Xml.Schema/ChangeLog +++ b/mcs/class/System.XML/Test/System.Xml.Schema/ChangeLog @@ -1,5 +1,9 @@ 2005-12-08 Atsushi Enomoto <atsushi@ximian.com> + * XmlSchemaSetTests.cs : added set_CompilationSettings tests. + +2005-12-08 Atsushi Enomoto <atsushi@ximian.com> + * XmlSchemaSetTests.cs : added CompilationSettings tests. 2005-12-01 Atsushi Enomoto <atsushi@ximian.com> diff --git a/mcs/class/System.XML/Test/System.Xml.Schema/XmlSchemaSetTests.cs b/mcs/class/System.XML/Test/System.Xml.Schema/XmlSchemaSetTests.cs index 19342db345e..d8d006fb860 100644 --- a/mcs/class/System.XML/Test/System.Xml.Schema/XmlSchemaSetTests.cs +++ b/mcs/class/System.XML/Test/System.Xml.Schema/XmlSchemaSetTests.cs @@ -71,6 +71,7 @@ namespace MonoTests.System.Xml public void CompilationSettings () { Assert.IsNotNull (new XmlSchemaSet ().CompilationSettings); + new XmlSchemaSet ().CompilationSettings = null; } [Test] |