2004-10-28 Atsushi Enomoto <atsushi@ximian.com>

	* IXmlDataEvidence.cs : disappeared.
	* XmlConvertDateTimeSerializationMode.cs : incorrect filename. removed.
	* XmlDateTimeSerializationMode.cs : added
	* NewLineHandling.cs : added
	* IXmlNamespaceResolver.cs, XmlNamespaceManager.cs :
	  now 'atomizedNames' is obsolete.
	* XmlReaderSettings.cs, XmlWriterSettings.cs :
	  Should not be sealed. Should not be ICloneable.

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

diff --git a/mcs/class/System.XML/System.Xml/ChangeLog b/mcs/class/System.XML/System.Xml/ChangeLog
index d3d00939f52cc244f0c7a6cb25193f1a9360ffe9..461515d6d4fd2980a1ca931cfada12914e12459d 100644 (file)
--- a/mcs/class/System.XML/System.Xml/ChangeLog
+++ b/mcs/class/System.XML/System.Xml/ChangeLog
@@ -1,3 +1,14 @@
+2004-10-28  Atsushi Enomoto <atsushi@ximian.com>
+
+       * IXmlDataEvidence.cs : disappeared.
+       * XmlConvertDateTimeSerializationMode.cs : incorrect filename. removed.
+       * XmlDateTimeSerializationMode.cs : added
+       * NewLineHandling.cs : added
+       * IXmlNamespaceResolver.cs, XmlNamespaceManager.cs :
+         now 'atomizedNames' is obsolete.
+       * XmlReaderSettings.cs, XmlWriterSettings.cs :
+         Should not be sealed. Should not be ICloneable.
+
 2004-10-28  Atsushi Enomoto <atsushi@ximian.com>
 
        * XmlDocument.cs : XPathEditableDocument looks broken. Just reverted

diff --git a/mcs/class/System.XML/System.Xml/IXmlDataEvidence.cs b/mcs/class/System.XML/System.Xml/IXmlDataEvidence.cs
deleted file mode 100644 (file)
index e5e16bf..0000000
--- a/mcs/class/System.XML/System.Xml/IXmlDataEvidence.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// IXmlDataEvidence.cs
-//
-// Author:
-//     Atsushi Enomoto <ginga@kit.hi-ho.ne.jp>
-//
-
-//
-// 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.Security.Policy;
-
-namespace System.Xml
-{
-
-       public interface IXmlDataEvidence
-       {
-               Evidence Evidence { get; } 
-       }
-}
-#endif

diff --git a/mcs/class/System.XML/System.Xml/IXmlNamespaceResolver.cs b/mcs/class/System.XML/System.Xml/IXmlNamespaceResolver.cs
index e0689059c55f6f5dd940334d1fc995b22c567fe5..10cebd3b63298e23c956e8745f16b036de8a70ec 100644 (file)
--- a/mcs/class/System.XML/System.Xml/IXmlNamespaceResolver.cs
+++ b/mcs/class/System.XML/System.Xml/IXmlNamespaceResolver.cs
@@ -39,16 +39,19 @@ namespace System.Xml
        internal interface IXmlNamespaceResolver
 #endif
        {
+               [Obsolete]
                XmlNameTable NameTable { get; } 
 
                IDictionary GetNamespacesInScope (XmlNamespaceScope scope);
 
                string LookupNamespace (string prefix);  
 
+               [Obsolete]
                string LookupNamespace (string prefix, bool atomizedName);  
 
                string LookupPrefix (string ns);  
 
+               [Obsolete]
                string LookupPrefix (string ns, bool atomizedName);  
        }
 }

diff --git a/mcs/class/System.XML/System.Xml/NewLineHandling.cs b/mcs/class/System.XML/System.Xml/NewLineHandling.cs
new file mode 100755 (executable)
index 0000000..d6d713d
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/NewLineHandling.cs
@@ -0,0 +1,38 @@
+//
+// NewLineHandling.cs
+//
+// Author:
+//     Atsushi Enomoto <atsushi@ximian.com>
+//
+
+//
+// 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
+namespace System.Xml
+{
+       public enum NewLineHandling
+       {
+               Replace,
+               Entitize,
+               None
+       }
+}
+#endif

diff --git a/mcs/class/System.XML/System.Xml/XmlConvertDateTimeSerializationMode.cs b/mcs/class/System.XML/System.Xml/XmlConvertDateTimeSerializationMode.cs
deleted file mode 100755 (executable)
index 21ced8d..0000000
--- a/mcs/class/System.XML/System.Xml/XmlConvertDateTimeSerializationMode.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// XmlConvertDateTimeOption.cs
-//
-// Author:
-//     Atsushi Enomoto <atsushi@ximian.com>
-//
-// Copyright (C) 2004 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
-
-namespace System.Xml {
-
-       public enum XmlConvertDateTimeOption {
-
-               Local = 0,
-
-               RoundTrip= 1,
-       }
-
-}
-
-#endif

diff --git a/mcs/class/System.XML/System.Xml/XmlDateTimeSerializationMode.cs b/mcs/class/System.XML/System.Xml/XmlDateTimeSerializationMode.cs
new file mode 100755 (executable)
index 0000000..87643eb
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlDateTimeSerializationMode.cs
@@ -0,0 +1,42 @@
+//
+// XmlDateTimeSerializationMode.cs
+//
+// Author:
+//     Atsushi Enomoto <atsushi@ximian.com>
+//
+// Copyright (C) 2004 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
+
+namespace System.Xml {
+
+       public enum XmlDateTimeSerializationMode {
+
+               Local = 0,
+
+               RoundTrip= 1,
+       }
+
+}
+
+#endif

diff --git a/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs b/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs
index 44cbaf7c852e78b48153a884fbd0869b05438683..6dab3f773ec36381c98ec130f6844d3e24357c0f 100644 (file)
--- a/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs
+++ b/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs
@@ -131,6 +131,7 @@ namespace System.Xml
                }
 
 #if NET_2_0
+               [Obsolete]
                public virtual void AddNamespace (string prefix, string uri, bool atomizedNames)
 #else
                internal virtual void AddNamespace (string prefix, string uri, bool atomizedNames)
@@ -248,6 +249,7 @@ namespace System.Xml
                }
                
 #if NET_2_0
+               [Obsolete]
                public virtual bool HasNamespace (string prefix, bool atomizedNames)
 #else
                internal virtual bool HasNamespace (string prefix, bool atomizedNames)
@@ -274,6 +276,7 @@ namespace System.Xml
                }
 
 #if NET_2_0
+               [Obsolete]
                public virtual string LookupNamespace (string prefix, bool atomizedNames)
 #else
                string IXmlNamespaceResolver.LookupNamespace (string prefix, bool atomizedNames)
@@ -321,6 +324,7 @@ namespace System.Xml
                }
 
 #if NET_2_0
+               [Obsolete]
                public string LookupPrefix (string uri, bool atomizedName)
 #else
                string IXmlNamespaceResolver.LookupPrefix (string uri, bool atomizedName)
@@ -386,6 +390,7 @@ namespace System.Xml
                }
 
 #if NET_2_0
+               [Obsolete]
                public virtual void RemoveNamespace (string prefix, string uri, bool atomizedNames)
 #else
                internal virtual void RemoveNamespace (string prefix, string uri, bool atomizedNames)

diff --git a/mcs/class/System.XML/System.Xml/XmlReaderSettings.cs b/mcs/class/System.XML/System.Xml/XmlReaderSettings.cs
index c19796935ac91cc429aac3623fbc3a4853aa9873..f493692ee0994bf0aafd1e6593c6589867cec601 100755 (executable)
--- a/mcs/class/System.XML/System.Xml/XmlReaderSettings.cs
+++ b/mcs/class/System.XML/System.Xml/XmlReaderSettings.cs
@@ -37,7 +37,7 @@ using System.Xml.Schema;
 \r
 namespace System.Xml\r
 {\r
-       public sealed class XmlReaderSettings : ICloneable\r
+       public class XmlReaderSettings\r
        {\r
                private bool checkCharacters;\r
                private bool closeInput;\r
@@ -92,11 +92,6 @@ namespace System.Xml
                        return new XmlReaderSettings (this);\r
                }\r
 \r
-               object ICloneable.Clone ()\r
-               {\r
-                       return this.Clone ();\r
-               }\r
-\r
                public void Reset ()\r
                {\r
                        checkCharacters = true;\r

diff --git a/mcs/class/System.XML/System.Xml/XmlWriterSettings.cs b/mcs/class/System.XML/System.Xml/XmlWriterSettings.cs
index f81a3f449e667cb53a80899ad8a2a25da1ec8e98..76c0a07b89616df89a9f9114a78616b2fd7ded4e 100755 (executable)
--- a/mcs/class/System.XML/System.Xml/XmlWriterSettings.cs
+++ b/mcs/class/System.XML/System.Xml/XmlWriterSettings.cs
@@ -37,9 +37,7 @@ using System.Xml.Schema;
 \r
 namespace System.Xml\r
 {\r
-       // FIXME: this class SHOULD have QuoteChar property\r
-       // (feedback has done against Microsoft).\r
-       public sealed class XmlWriterSettings : ICloneable\r
+       public class XmlWriterSettings\r
        {\r
                private bool checkCharacters;\r
                private bool closeOutput;\r
@@ -76,11 +74,6 @@ namespace System.Xml
                        return new XmlWriterSettings (this);\r
                }\r
 \r
-               object ICloneable.Clone ()\r
-               {\r
-                       return this.Clone ();\r
-               }\r
-\r
                public void Reset ()\r
                {\r
                        checkCharacters = true;\r