Преглед на файлове

2004-10-29 Atsushi Enomoto <[email protected]>

	* XmlSchemaComplexType.cs : added LocalElements, with the description
	  why it can never be correct implementation.
	* XmlSchemaUtil.cs : use IHasXmlParserContext.

svn path=/trunk/mcs/; revision=35436
Atsushi Eno преди 21 години
родител
ревизия
afd86b9ae9

+ 6 - 0
mcs/class/System.XML/System.Xml.Schema/ChangeLog

@@ -1,3 +1,9 @@
+2004-10-29  Atsushi Enomoto <[email protected]>
+
+	* XmlSchemaComplexType.cs : added LocalElements, with the description
+	  why it can never be correct implementation.
+	* XmlSchemaUtil.cs : use IHasXmlParserContext.
+
 2004-10-29  Atsushi Enomoto <[email protected]>
 
 	* XmlSchemaSimpleTypeUnion.cs : Added 2.0 BaseMemberTypes property 

+ 21 - 0
mcs/class/System.XML/System.Xml.Schema/XmlSchemaComplexType.cs

@@ -179,6 +179,27 @@ namespace System.Xml.Schema
 		{
 			get{ return attributeWildcard; }
 		}
+
+#if NET_2_0
+		[XmlIgnore]
+		// LAMESPEC: This property is based on the premise that
+		// every particle has a unique name, but actually particles
+		// can be like:
+		// <sequence>
+		//  <element name='foo'/>
+		//  <element name='foo'>
+		//    <annotation>
+		//      <documentation>blah</documentation>
+		//    </annotation>
+		//  </element>
+		// </sequence>
+		//
+		// So with this signature this property can never be correct.
+		public XmlSchemaObjectTable LocalElements {
+			get { throw new NotImplementedException (); }
+		}
+#endif
+
 		#endregion
 
 		internal XmlSchemaParticle ValidatableParticle 

+ 0 - 9
mcs/class/System.XML/System.Xml.Schema/XmlSchemaUtil.cs

@@ -117,15 +117,6 @@ namespace System.Xml.Schema
 
 		public static XmlParserContext GetParserContext (XmlReader reader)
 		{
-			XmlTextReader xtr = reader as XmlTextReader;
-			if (xtr != null)
-				return xtr.GetInternalParserContext ();
-			XmlNodeReader xnr = reader as XmlNodeReader;
-			if (xnr != null)
-				return xnr.GetInternalParserContext ();
-			XmlValidatingReader xvr = reader as XmlValidatingReader;
-			if (xvr != null)
-				return xvr.GetInternalParserContext ();
 			IHasXmlParserContext xctx = reader as IHasXmlParserContext;
 			if (xctx != null)
 				return xctx.ParserContext;