merge r67228-r67235, r67237, r67251 and r67256-67259 to trunk (they are

[mono.git] / mcs / class / System.XML / System.Xml.Serialization / XmlSchemaEnumerator.cs

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaEnumerator.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaEnumerator.cs
index d324acf1709671a748a5079f233bfa5669d46abf..fd90a9ef8dc6becd01c4c381e5d684e6aa9dc2e3 100644 (file)
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaEnumerator.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaEnumerator.cs
@@ -1,73 +1,73 @@
-// 
-// System.Xml.Serialization.XmlSerializerVersionAttribute.cs 
-//
-// Author:
-//   Atsushi Enomoto <atsushi@ximian.com>
-//
-// Copyright (C) 2006 Novell, Inc.
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Xml.Schema;
-
-namespace System.Xml.Serialization
-{
-       [MonoTODO]
-       public class XmlSchemaEnumerator : IEnumerator<XmlSchema>, IDisposable, IEnumerator
-       {
-               IEnumerator e;
-
-               public XmlSchemaEnumerator (XmlSchemas list)
-               {
-                       e = list.GetEnumerator ();
-               }
-
-               public XmlSchema Current {
-                       get { return (XmlSchema) e.Current; }
-               }
-
-               public void Dispose ()
-               {
-               }
-
-               public bool MoveNext ()
-               {
-                       return e.MoveNext ();
-               }
-
-               object IEnumerator.Current {
-                       get { return Current; }
-               }
-
-               void IEnumerator.Reset ()
-               {
-                       e.Reset ();
-               }
-       }
-}
-#endif
+// \r
+// System.Xml.Serialization.XmlSerializerVersionAttribute.cs \r
+//\r
+// Author:\r
+//   Atsushi Enomoto <atsushi@ximian.com>\r
+//\r
+// Copyright (C) 2006 Novell, Inc.\r
+//\r
+\r
+//\r
+// Permission is hereby granted, free of charge, to any person obtaining\r
+// a copy of this software and associated documentation files (the\r
+// "Software"), to deal in the Software without restriction, including\r
+// without limitation the rights to use, copy, modify, merge, publish,\r
+// distribute, sublicense, and/or sell copies of the Software, and to\r
+// permit persons to whom the Software is furnished to do so, subject to\r
+// the following conditions:\r
+// \r
+// The above copyright notice and this permission notice shall be\r
+// included in all copies or substantial portions of the Software.\r
+// \r
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\r
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\r
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\r
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\r
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\r
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\r
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
+//\r
+\r
+#if NET_2_0\r
+\r
+using System;\r
+using System.Collections;\r
+using System.Collections.Generic;\r
+using System.Xml.Schema;\r
+\r
+namespace System.Xml.Serialization\r
+{\r
+       [MonoTODO]\r
+       public class XmlSchemaEnumerator : IEnumerator<XmlSchema>, IDisposable, IEnumerator\r
+       {\r
+               IEnumerator e;\r
+\r
+               public XmlSchemaEnumerator (XmlSchemas list)\r
+               {\r
+                       e = list.GetEnumerator ();\r
+               }\r
+\r
+               public XmlSchema Current {\r
+                       get { return (XmlSchema) e.Current; }\r
+               }\r
+\r
+               public void Dispose ()\r
+               {\r
+               }\r
+\r
+               public bool MoveNext ()\r
+               {\r
+                       return e.MoveNext ();\r
+               }\r
+\r
+               object IEnumerator.Current {\r
+                       get { return Current; }\r
+               }\r
+\r
+               void IEnumerator.Reset ()\r
+               {\r
+                       e.Reset ();\r
+               }\r
+       }\r
+}\r
+#endif\r