2004-08-10 Atsushi Enomoto <atsushi@ximian.com>
authorAtsushi Eno <atsushieno@gmail.com>
Tue, 10 Aug 2004 14:08:10 +0000 (14:08 -0000)
committerAtsushi Eno <atsushieno@gmail.com>
Tue, 10 Aug 2004 14:08:10 +0000 (14:08 -0000)
* XmlSchemaCollection.cs : replaced CRLF to LF (they were mixed).

svn path=/trunk/mcs/; revision=32142

mcs/class/System.XML/System.Xml.Schema/ChangeLog
mcs/class/System.XML/System.Xml.Schema/XmlSchemaCollection.cs

index 975d06ba71d9b7a74b12849ea16e6ff8f3c55f88..3ceaee9c3d7b141342e42726a72f96fd6f1e5462 100755 (executable)
@@ -1,3 +1,7 @@
+2004-08-10  Atsushi Enomoto <atsushi@ximian.com>
+
+       * XmlSchemaCollection.cs : replaced CRLF to LF (they were mixed).
+
 2004-08-10  Atsushi Enomoto <atsushi@ximian.com>
 
        * XmlSchema.cs : code reformatting. convert CRLF to LF.
index e450d2709baf87ba7f2fb65ffbdcfea248f682ee..d5d1fdf02ef2c1b4d34fe38563d7cb8b9f4d8a1e 100755 (executable)
@@ -1,10 +1,10 @@
-//\r
-// System.Xml.Schema.XmlSchemaCollection.cs\r
-//\r
-// Authors:\r
-//     Dwivedi, Ajay kumar  Adwiv@Yahoo.com\r
-//     Atsushi Enomoto      ginga@kit.hi-ho.ne.jp\r
-//\r
+//
+// System.Xml.Schema.XmlSchemaCollection.cs
+//
+// Authors:
+//     Dwivedi, Ajay kumar  Adwiv@Yahoo.com
+//     Atsushi Enomoto      ginga@kit.hi-ho.ne.jp
+//
 
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-using System;\r
-using System.Collections;\r
-using System.Xml;\r
-\r
-\r
-namespace System.Xml.Schema\r
-{\r
-       /// <summary>\r
-       /// Summary description for XmlSchemaCollection.\r
-       ///\r
-       /// It is just a wrapper for XmlSchemaSet (unlike MS.NET, our \r
-       /// XmlSchemaCollection is originally designed to be conformant to \r
-       /// W3C specification).\r
-       /// </summary>\r
-       public sealed class XmlSchemaCollection : ICollection, IEnumerable\r
-       {\r
-               //private fields\r
-               private XmlSchemaSet schemaSet;\r
-\r
-               public XmlSchemaCollection ()\r
-                       : this (new NameTable ())\r
-               {\r
-               }\r
-\r
-               public XmlSchemaCollection (XmlNameTable nameTable)\r
-                       : this (new XmlSchemaSet (nameTable))\r
-               {\r
-                       this.schemaSet.SchemaCollection = this;\r
-               }\r
-\r
-               internal XmlSchemaCollection (XmlSchemaSet schemaSet)\r
-               {\r
-                       this.schemaSet = schemaSet;\r
-               }\r
-\r
-               //properties\r
-               internal XmlSchemaSet SchemaSet {\r
-                       get { return schemaSet; }\r
-               }\r
-\r
-               public int Count {\r
-                       get { return schemaSet.Count; }\r
-               }\r
-\r
-               public XmlNameTable NameTable { \r
-                       get { return schemaSet.NameTable; }\r
-               }\r
-\r
-               public XmlSchema this [ string ns ] { \r
-                       get { return schemaSet.Get (ns); }\r
-               }\r
-\r
-               // Events\r
-               public event ValidationEventHandler ValidationEventHandler;\r
-\r
-               // Methods\r
-               public XmlSchema Add (string ns, XmlReader reader)\r
-               {\r
-                       return Add (ns, reader, new XmlUrlResolver ());\r
-               }\r
-\r
-#if NET_1_0\r
-               internal XmlSchema Add (string ns, XmlReader reader, XmlResolver resolver)\r
-#else\r
-               public XmlSchema Add (string ns, XmlReader reader, XmlResolver resolver)\r
-#endif\r
-               {\r
-                       XmlSchema schema = XmlSchema.Read (reader, ValidationEventHandler);\r
-                       schema.Compile (ValidationEventHandler, this, resolver);\r
-                       lock (schemaSet) {\r
-                               return schemaSet.Add (schema);\r
-                       }\r
-               }\r
-\r
-               public XmlSchema Add (string ns, string uri)\r
-               {\r
-                       lock (schemaSet) {\r
-                               return schemaSet.Add (ns, uri);\r
-                       }\r
-               }\r
-\r
-               public XmlSchema Add (XmlSchema schema)\r
-               {\r
-                       return Add (schema, new XmlUrlResolver ());\r
-               }\r
-\r
-               public XmlSchema Add (XmlSchema schema, XmlResolver resolver)\r
-               {\r
-                       if (schema == null)\r
-                               throw new ArgumentNullException ("schema");\r
-\r
-                       // XmlSchemaCollection.Add() compiles, while XmlSchemaSet.Add() does not\r
-                       if (!schema.IsCompiled)\r
-                               schema.Compile (ValidationEventHandler, this, resolver);\r
-\r
-                       string ns = GetSafeNs (schema.TargetNamespace);\r
-                       lock (schemaSet) {\r
-                               if (schemaSet.Contains (ns))\r
-                                       schemaSet.Remove (schemaSet.Get (ns));\r
-                               return schemaSet.Add (schema);\r
-                       }\r
-               }\r
-\r
-               private string GetSafeNs (string ns)\r
-               {\r
-                       return ns != null ? ns : String.Empty;\r
-               }\r
-\r
-               public void Add (XmlSchemaCollection schema)\r
-               {\r
-                       if (schema == null)\r
-                               throw new ArgumentNullException ("schema");\r
-\r
-                       /*\r
-                       foreach (XmlSchema s in schema) {\r
-                               string ns = GetSafeNs (s.TargetNamespace);\r
-                               lock (schemaSet) {\r
-                                       if (schemaSet.Contains (ns))\r
-                                               schemaSet.Remove (schemaSet.Get (ns));\r
-                                       schemaSet.Add (s);\r
-                               }\r
-                       }\r
-                       */\r
-                       lock (schemaSet) {\r
-                               schemaSet.Add (schema.schemaSet);\r
-                       }\r
-               }\r
-\r
-               public bool Contains (string ns)\r
-               {\r
-                       lock (schemaSet) {\r
-                               return schemaSet.Contains (ns);\r
-                       }\r
-               }\r
-\r
-               public bool Contains (XmlSchema schema)\r
-               {\r
-                       lock (schemaSet) {\r
-                               return schemaSet.Contains (schema);\r
-                       }\r
-               }\r
-\r
-               public void CopyTo (XmlSchema[] array, int index)\r
-               {\r
-                       lock (schemaSet) {\r
-                               schemaSet.CopyTo (array, index);\r
-                       }\r
-               }\r
-\r
-               public XmlSchemaCollectionEnumerator GetEnumerator ()\r
-               {\r
-                       return new XmlSchemaCollectionEnumerator (this);\r
-               }\r
-               \r
-               // interface Methods\r
-               void ICollection.CopyTo (Array array, int index)\r
-               {\r
-                       lock (schemaSet) {\r
-                               schemaSet.CopyTo (array, index);\r
-                       }\r
-               }\r
-\r
-               bool ICollection.IsSynchronized\r
-               {\r
-                       get { return true; } // always\r
-               }\r
-\r
-               IEnumerator IEnumerable.GetEnumerator ()\r
-               {\r
-                       return schemaSet.GetEnumerator ();\r
-               }\r
-\r
-               Object ICollection.SyncRoot\r
-               {\r
-                       get { return this; }\r
-               }\r
-\r
-               // Internal Methods\r
-               internal XmlSchemaAttribute FindAttribute (XmlQualifiedName qname)\r
-               {\r
-                       return (XmlSchemaAttribute) schemaSet.GlobalAttributes [qname];\r
-               }\r
-\r
-               internal XmlSchemaElement FindElement (XmlQualifiedName qname)\r
-               {\r
-                       return (XmlSchemaElement) schemaSet.GlobalElements [qname];\r
-               }\r
-\r
-               internal object FindSchemaType (XmlQualifiedName qname)\r
-               {\r
-                       return schemaSet.GlobalTypes [qname];\r
-               }\r
-\r
+using System;
+using System.Collections;
+using System.Xml;
+
+
+namespace System.Xml.Schema
+{
+       /// <summary>
+       /// Summary description for XmlSchemaCollection.
+       ///
+       /// It is just a wrapper for XmlSchemaSet (unlike MS.NET, our 
+       /// XmlSchemaCollection is originally designed to be conformant to 
+       /// W3C specification).
+       /// </summary>
+       public sealed class XmlSchemaCollection : ICollection, IEnumerable
+       {
+               //private fields
+               private XmlSchemaSet schemaSet;
+
+               public XmlSchemaCollection ()
+                       : this (new NameTable ())
+               {
+               }
+
+               public XmlSchemaCollection (XmlNameTable nameTable)
+                       : this (new XmlSchemaSet (nameTable))
+               {
+                       this.schemaSet.SchemaCollection = this;
+               }
+
+               internal XmlSchemaCollection (XmlSchemaSet schemaSet)
+               {
+                       this.schemaSet = schemaSet;
+               }
+
+               //properties
+               internal XmlSchemaSet SchemaSet {
+                       get { return schemaSet; }
+               }
+
+               public int Count {
+                       get { return schemaSet.Count; }
+               }
+
+               public XmlNameTable NameTable { 
+                       get { return schemaSet.NameTable; }
+               }
+
+               public XmlSchema this [ string ns ] { 
+                       get { return schemaSet.Get (ns); }
+               }
+
+               // Events
+               public event ValidationEventHandler ValidationEventHandler;
+
+               // Methods
+               public XmlSchema Add (string ns, XmlReader reader)
+               {
+                       return Add (ns, reader, new XmlUrlResolver ());
+               }
+
+#if NET_1_0
+               internal XmlSchema Add (string ns, XmlReader reader, XmlResolver resolver)
+#else
+               public XmlSchema Add (string ns, XmlReader reader, XmlResolver resolver)
+#endif
+               {
+                       XmlSchema schema = XmlSchema.Read (reader, ValidationEventHandler);
+                       schema.Compile (ValidationEventHandler, this, resolver);
+                       lock (schemaSet) {
+                               return schemaSet.Add (schema);
+                       }
+               }
+
+               public XmlSchema Add (string ns, string uri)
+               {
+                       lock (schemaSet) {
+                               return schemaSet.Add (ns, uri);
+                       }
+               }
+
+               public XmlSchema Add (XmlSchema schema)
+               {
+                       return Add (schema, new XmlUrlResolver ());
+               }
+
+               public XmlSchema Add (XmlSchema schema, XmlResolver resolver)
+               {
+                       if (schema == null)
+                               throw new ArgumentNullException ("schema");
+
+                       // XmlSchemaCollection.Add() compiles, while XmlSchemaSet.Add() does not
+                       if (!schema.IsCompiled)
+                               schema.Compile (ValidationEventHandler, this, resolver);
+
+                       string ns = GetSafeNs (schema.TargetNamespace);
+                       lock (schemaSet) {
+                               if (schemaSet.Contains (ns))
+                                       schemaSet.Remove (schemaSet.Get (ns));
+                               return schemaSet.Add (schema);
+                       }
+               }
+
+               private string GetSafeNs (string ns)
+               {
+                       return ns != null ? ns : String.Empty;
+               }
+
+               public void Add (XmlSchemaCollection schema)
+               {
+                       if (schema == null)
+                               throw new ArgumentNullException ("schema");
+
+                       /*
+                       foreach (XmlSchema s in schema) {
+                               string ns = GetSafeNs (s.TargetNamespace);
+                               lock (schemaSet) {
+                                       if (schemaSet.Contains (ns))
+                                               schemaSet.Remove (schemaSet.Get (ns));
+                                       schemaSet.Add (s);
+                               }
+                       }
+                       */
+                       lock (schemaSet) {
+                               schemaSet.Add (schema.schemaSet);
+                       }
+               }
+
+               public bool Contains (string ns)
+               {
+                       lock (schemaSet) {
+                               return schemaSet.Contains (ns);
+                       }
+               }
+
+               public bool Contains (XmlSchema schema)
+               {
+                       lock (schemaSet) {
+                               return schemaSet.Contains (schema);
+                       }
+               }
+
+               public void CopyTo (XmlSchema[] array, int index)
+               {
+                       lock (schemaSet) {
+                               schemaSet.CopyTo (array, index);
+                       }
+               }
+
+               public XmlSchemaCollectionEnumerator GetEnumerator ()
+               {
+                       return new XmlSchemaCollectionEnumerator (this);
+               }
+               
+               // interface Methods
+               void ICollection.CopyTo (Array array, int index)
+               {
+                       lock (schemaSet) {
+                               schemaSet.CopyTo (array, index);
+                       }
+               }
+
+               bool ICollection.IsSynchronized
+               {
+                       get { return true; } // always
+               }
+
+               IEnumerator IEnumerable.GetEnumerator ()
+               {
+                       return schemaSet.GetEnumerator ();
+               }
+
+               Object ICollection.SyncRoot
+               {
+                       get { return this; }
+               }
+
+               // Internal Methods
+               internal XmlSchemaAttribute FindAttribute (XmlQualifiedName qname)
+               {
+                       return (XmlSchemaAttribute) schemaSet.GlobalAttributes [qname];
+               }
+
+               internal XmlSchemaElement FindElement (XmlQualifiedName qname)
+               {
+                       return (XmlSchemaElement) schemaSet.GlobalElements [qname];
+               }
+
+               internal object FindSchemaType (XmlQualifiedName qname)
+               {
+                       return schemaSet.GlobalTypes [qname];
+               }
+
                internal void OnValidationError (object o, ValidationEventArgs e)
                {
                        if (ValidationEventHandler != null)
@@ -227,5 +227,5 @@ namespace System.Xml.Schema
                                throw e.Exception;
                }
 
-       }\r
-}\r
+       }
+}