2006-11-02 Atsushi Enomoto <atsushi@ximian.com>

[mono.git] / mcs / class / System.Web.Services / System.Web.Services.Description / ServiceDescription.cs

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescription.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescription.cs
index 1feebaf844a4baeb2deec5a087a56346a9bfb571..66729c338ab7dccfc43d4f12f03793533a8aac6a 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescription.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescription.cs
@@ -37,10 +37,6 @@ using System.Web.Services.Configuration;
 using System.Xml;\r
 using System.Xml.Schema;\r
 using System.Xml.Serialization;\r
-
-#if NET_2_0
-using System.Collections.Generic;
-#endif
 \r
 namespace System.Web.Services.Description\r
 {\r
@@ -88,7 +84,7 @@ namespace System.Web.Services.Description
                        imports = new ImportCollection (this);\r
                        messages = new MessageCollection (this);\r
 #if !NET_2_0\r
-//                     name = String.Empty;            \r
+                       name = String.Empty;            \r
 #endif\r
                        portTypes = new PortTypeCollection (this);\r
 \r
@@ -129,11 +125,7 @@ namespace System.Web.Services.Description
                }\r
 \r
                [XmlIgnore]\r
-               public 
-#if NET_2_0
-               override
-#endif
-               ServiceDescriptionFormatExtensionCollection Extensions {        \r
+               public ServiceDescriptionFormatExtensionCollection Extensions {         \r
                        get { return extensions; }\r
                }\r
 \r
@@ -300,7 +292,7 @@ namespace System.Web.Services.Description
                        info.Serializer.Serialize (writer, ext, ns);\r
                }\r
                \r
-               internal static void ReadExtension (XmlDocument doc, XmlReader reader, object ob)\r
+               internal static void ReadExtension (XmlReader reader, object ob)\r
                {\r
                        ServiceDescriptionFormatExtensionCollection extensions = ExtensionManager.GetExtensionPoint (ob);\r
                        if (extensions != null)\r
@@ -310,26 +302,13 @@ namespace System.Web.Services.Description
                                {\r
                                        object extension = info.Serializer.Deserialize (reader);\r
                                        extensions.Add ((ServiceDescriptionFormatExtension)extension);\r
-                                       return;
+                                       return;\r
                                }\r
                        }\r
-
-                       //No XmlFormatExtensionPoint attribute found
-
-#if NET_2_0
-                       //Add to DocumentableItem.Extensions property
-                       DocumentableItem item = ob as DocumentableItem;
-                       if (item == null) {
-                               reader.Skip ();
-                               return;
-                       }
-
-                       item.Extensions.Add (doc.ReadNode (reader));
-#else
-                       reader.Skip ();
-#endif
+                       reader.Skip ();\r
                }\r
 \r
+\r
                #endregion\r
 \r
                internal class ServiceDescriptionSerializer : XmlSerializer \r
@@ -337,13 +316,13 @@ namespace System.Web.Services.Description
                        protected override void Serialize (object o, XmlSerializationWriter writer)\r
                        {\r
                                ServiceDescriptionWriterBase xsWriter = writer as ServiceDescriptionWriterBase;\r
-                               xsWriter.WriteRoot_ServiceDescription (o);\r
+                               xsWriter.WriteTree ((ServiceDescription)o);\r
                        }\r
                        \r
                        protected override object Deserialize (XmlSerializationReader reader)\r
                        {\r
                                ServiceDescriptionReaderBase xsReader = reader as ServiceDescriptionReaderBase;\r
-                               return xsReader.ReadRoot_ServiceDescription ();
+                               return xsReader.ReadTree ();\r
                        }\r
                        \r
                        protected override XmlSerializationWriter CreateWriter ()\r