2002-08-19 Tim Coleman <tim@timcoleman.com>

        * DiscoveryClientProtocol.cs:
                Added ResolveAll () stub.
        * DiscoveryDocument.cs:
                Added XmlRoot attribute to class.
        * DiscoveryClientDocumentCollection.cs:
        * DiscoveryClientReferenceCollection.cs:
        * DiscoveryClientResultCollection.cs:
        * DiscoveryReferenceCollection.cs:
                Implementation of these classes.

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

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Discovery/ChangeLog b/mcs/class/System.Web.Services/System.Web.Services.Discovery/ChangeLog
index 55a5823a45f3da966f1a6ddc846dce5518eb4b2e..5f4f2cbda07b5a89f1193acf08f574edeebea480 100755 (executable)
--- a/mcs/class/System.Web.Services/System.Web.Services.Discovery/ChangeLog
+++ b/mcs/class/System.Web.Services/System.Web.Services.Discovery/ChangeLog
@@ -1,3 +1,14 @@
+2002-08-19  Tim Coleman <tim@timcoleman.com>
+       * DiscoveryClientProtocol.cs:
+               Added ResolveAll () stub.
+       * DiscoveryDocument.cs:
+               Added XmlRoot attribute to class.
+       * DiscoveryClientDocumentCollection.cs:
+       * DiscoveryClientReferenceCollection.cs:
+       * DiscoveryClientResultCollection.cs:
+       * DiscoveryReferenceCollection.cs:
+               Implementation of these classes.
+
 2002-08-04  Dave Bettin <javabettin@yahoo.com>
                * ContractSearchPattern.cs
                * DiscoveryClientDocumentCollection.cs

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryClientDocumentCollection.cs b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryClientDocumentCollection.cs
index 985570cb54121eba40019118954919534223e9ea..3d4e77ee2c4bb8cf78519837041ef01734b3e306 100755 (executable)
--- a/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryClientDocumentCollection.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryClientDocumentCollection.cs
@@ -3,68 +3,64 @@
 //\r
 // Author:\r
 //   Dave Bettin (javabettin@yahoo.com)\r
+//   Tim Coleman (tim@timcoleman.com)\r
 //\r
 // Copyright (C) Dave Bettin, 2002\r
+// Copyright (C) Tim Coleman, 2002\r
 //\r
 \r
 using System.Collections;\r
 \r
 namespace System.Web.Services.Discovery {\r
-\r
        public sealed class DiscoveryClientDocumentCollection : DictionaryBase {\r
 \r
                #region Constructors \r
 \r
-               [MonoTODO]\r
                public DiscoveryClientDocumentCollection () \r
+                       : base ()\r
                {\r
-                       throw new NotImplementedException ();\r
                }\r
                \r
                #endregion // Constructors\r
 \r
                #region Properties\r
 \r
-               public object this[string url] {\r
-                       [MonoTODO]\r
-                       get { throw new NotImplementedException (); }\r
-                       \r
-                       [MonoTODO]\r
-                       set { throw new NotImplementedException (); }\r
+               public object this [string url] {\r
+                       get { return InnerHashtable [url]; }\r
+                       set { \r
+                               if (url == null)\r
+                                       throw new ArgumentNullException ();\r
+                               InnerHashtable [url] = value; \r
+                       }\r
                }\r
                \r
                public ICollection Keys {\r
-                       [MonoTODO]\r
-                       get { throw new NotImplementedException (); }\r
+                       get { return InnerHashtable.Keys; }\r
                }\r
                \r
                public ICollection Values {\r
-                       [MonoTODO]\r
-                       get { throw new NotImplementedException (); }\r
+                       get { return InnerHashtable.Values; }\r
                }\r
                \r
                #endregion // Properties\r
 \r
                #region Methods\r
 \r
-               [MonoTODO]\r
                public void Add (string url, object value)\r
                {\r
-                        throw new NotImplementedException ();\r
+                       InnerHashtable [url] = value;\r
                }\r
 \r
-               [MonoTODO]\r
                public bool Contains (string url)\r
                {\r
-                        throw new NotImplementedException ();\r
+                       return InnerHashtable.Contains (url);\r
                }\r
                \r
-               [MonoTODO]\r
                public void Remove (string url)\r
                {\r
-                        throw new NotImplementedException ();\r
+                       InnerHashtable.Remove (url);\r
                }\r
 \r
                #endregion // Methods\r
        }\r
-}
\ No newline at end of file
+}\r

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryClientProtocol.cs b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryClientProtocol.cs
index 6fc3aad644ff3cf5fc0aa43b8a4545b6bb821de1..622222c19d8eb96026b70dbaefbdd6b4f5d77a5d 100755 (executable)
--- a/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryClientProtocol.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryClientProtocol.cs
@@ -84,6 +84,12 @@ namespace System.Web.Services.Discovery {
                {\r
                         throw new NotImplementedException ();\r
                }\r
+\r
+               [MonoTODO]\r
+               public void ResolveAll ()\r
+               {\r
+                       throw new NotImplementedException (); \r
+               }\r
                \r
                [MonoTODO]\r
                public void ResolveOneLevel ()\r

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryClientReferenceCollection.cs b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryClientReferenceCollection.cs
index 7cee34b1a1615846c23639bb31980cc43eefbd8e..a98ec11202252d56bf09298a18f02210a1575226 100755 (executable)
--- a/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryClientReferenceCollection.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryClientReferenceCollection.cs
@@ -3,8 +3,10 @@
 //\r
 // Author:\r
 //   Dave Bettin (javabettin@yahoo.com)\r
+//   Tim Coleman (tim@timcoleman.com)\r
 //\r
 // Copyright (C) Dave Bettin, 2002\r
+// Copyright (C) Tim Coleman, 2002\r
 //\r
 \r
 using System.Collections;\r
@@ -14,60 +16,50 @@ namespace System.Web.Services.Discovery {
 \r
                #region Constructors\r
 \r
-               [MonoTODO]\r
                public DiscoveryClientReferenceCollection () \r
+                       : base ()\r
                {\r
-                       throw new NotImplementedException ();\r
                }\r
                \r
                #endregion // Constructors\r
 \r
                #region Properties\r
 \r
-               public DiscoveryReference this[string url] {\r
-                       [MonoTODO]\r
-                       get { throw new NotImplementedException (); }\r
-                       \r
-                       [MonoTODO]\r
-                       set { throw new NotImplementedException (); }\r
+               public DiscoveryReference this [string url] {\r
+                       get { return (DiscoveryReference) InnerHashtable [url]; }\r
+                       set { InnerHashtable [url] = value; }\r
                }\r
                \r
                public ICollection Keys {\r
-                       [MonoTODO]\r
-                       get { throw new NotImplementedException (); }\r
+                       get { return InnerHashtable.Keys; }\r
                }\r
                \r
                public ICollection Values {\r
-                       [MonoTODO]\r
-                       get { throw new NotImplementedException (); }\r
+                       get { return InnerHashtable.Values; }\r
                }\r
                \r
                #endregion // Properties\r
 \r
                #region Methods\r
 \r
-               [MonoTODO]\r
                public void Add (DiscoveryReference value)\r
                {\r
-                        throw new NotImplementedException ();\r
+                       Add (value.Url, value);\r
                }\r
                \r
-               [MonoTODO]\r
                public void Add (string url, DiscoveryReference value)\r
                {\r
-                        throw new NotImplementedException ();\r
+                       InnerHashtable [url] = value;\r
                }\r
 \r
-               [MonoTODO]\r
                public bool Contains (string url)\r
                {\r
-                        throw new NotImplementedException ();\r
+                       return InnerHashtable.Contains (url);\r
                }\r
                \r
-               [MonoTODO]\r
                public void Remove (string url)\r
                {\r
-                        throw new NotImplementedException ();\r
+                       InnerHashtable.Remove (url);\r
                }\r
 \r
                #endregion // Methods\r

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryClientResultCollection.cs b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryClientResultCollection.cs
index fd4dc3b1d050c733df1a697bf6972949340fc911..8f93bb0d24bcf4aa360a4f85c7260e1f667763f7 100755 (executable)
--- a/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryClientResultCollection.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryClientResultCollection.cs
@@ -3,8 +3,10 @@
 //\r
 // Author:\r
 //   Dave Bettin (javabettin@yahoo.com)\r
+//   Tim Coleman (tim@timcoleman.com)\r
 //\r
 // Copyright (C) Dave Bettin, 2002\r
+// Copyright (C) Tim Coleman, 2002\r
 //\r
 \r
 using System.Collections;\r
@@ -14,44 +16,45 @@ namespace System.Web.Services.Discovery {
 \r
                #region Constructors\r
 \r
-               [MonoTODO]\r
                public DiscoveryClientResultCollection () \r
+                       : base ()\r
                {\r
-                       throw new NotImplementedException ();\r
                }\r
                \r
                #endregion // Constructors\r
 \r
                #region Properties\r
 \r
-               public DiscoveryClientResult this[int i] {\r
-                       [MonoTODO]\r
-                       get { throw new NotImplementedException (); }\r
-                       \r
-                       [MonoTODO]\r
-                       set { throw new NotImplementedException (); }\r
+               public DiscoveryClientResult this [int i] {\r
+                       get { \r
+                               if (i < 0 || i >= Count)\r
+                                       throw new ArgumentOutOfRangeException (); \r
+                               return (DiscoveryClientResult) InnerList [i]; \r
+                       }       \r
+                       set { \r
+                               if (i < 0 || i >= Count)\r
+                                       throw new ArgumentOutOfRangeException (); \r
+                               InnerList [i] = value; \r
+                       }\r
                }                               \r
                \r
                #endregion // Properties\r
 \r
                #region Methods\r
 \r
-               [MonoTODO]\r
                public int Add (DiscoveryClientResult value)\r
                {\r
-                        throw new NotImplementedException ();\r
+                       return InnerList.Add (value);\r
                }\r
 \r
-               [MonoTODO]\r
                public bool Contains (DiscoveryClientResult value)\r
                {\r
-                        throw new NotImplementedException ();\r
+                       return InnerList.Contains (value);\r
                }\r
                \r
-               [MonoTODO]\r
                public void Remove (DiscoveryClientResult value)\r
                {\r
-                        throw new NotImplementedException ();\r
+                       InnerList.Remove (value);\r
                }\r
 \r
                #endregion // Methods\r

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryDocument.cs b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryDocument.cs
index 7c23bf673ddcac0bea303a4ed9c63d24a1cf2aa7..35a7010b08f3f2459c84a2707e1e7d82c0c00a25 100755 (executable)
--- a/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryDocument.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryDocument.cs
@@ -15,6 +15,7 @@ using System.Xml;
 using System.Xml.Serialization;\r
 \r
 namespace System.Web.Services.Discovery {\r
+       [XmlRoot ("discovery", Namespace = "http://schemas.xmlsoap.org/disco/")]\r
        public sealed class DiscoveryDocument {\r
 \r
                #region Fields\r

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryReferenceCollection.cs b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryReferenceCollection.cs
index bf8a5702bd6220ffddf21d818b50fe47524ef4bb..ec81f3dadfc33d7e924db715e3460286e97d387b 100755 (executable)
--- a/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryReferenceCollection.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryReferenceCollection.cs
@@ -3,57 +3,58 @@
 //\r
 // Author:\r
 //   Dave Bettin (javabettin@yahoo.com)\r
+//   Tim Coleman (tim@timcoleman.com)\r
 //\r
 // Copyright (C) Dave Bettin, 2002\r
+// Copyright (C) Tim Coleman, 2002\r
 //\r
 \r
 using System.Collections;\r
-using System.Reflection;\r
 \r
 namespace System.Web.Services.Discovery {\r
-\r
        public sealed class DiscoveryReferenceCollection : CollectionBase {\r
 \r
                #region Constructors\r
 \r
-               [MonoTODO]\r
                public DiscoveryReferenceCollection () \r
+                       : base ()\r
                {\r
-                       throw new NotImplementedException ();\r
                }\r
                \r
                #endregion // Constructors\r
 \r
                #region Properties\r
 \r
-               public DiscoveryReference this[int i] {\r
-                       [MonoTODO]\r
-                       get { throw new NotImplementedException (); }\r
-                       \r
-                       [MonoTODO]\r
-                       set { throw new NotImplementedException (); }\r
+               public DiscoveryReference this [int i] {\r
+                       get { \r
+                               if (i < 0 || i >= Count)\r
+                                       throw new ArgumentOutOfRangeException ();\r
+                               return (DiscoveryReference) InnerList [i]; \r
+                       }\r
+                       set {\r
+                               if (i < 0 || i >= Count)\r
+                                       throw new ArgumentOutOfRangeException ();\r
+                               InnerList [i] = value;\r
+                       }\r
                }\r
                \r
                #endregion // Properties\r
 \r
                #region Methods\r
 \r
-               [MonoTODO]\r
                public int Add (DiscoveryReference value)\r
                {\r
-                        throw new NotImplementedException ();\r
+                       return InnerList.Add (value);\r
                }\r
 \r
-               [MonoTODO]\r
                public bool Contains (DiscoveryReference value)\r
                {\r
-                        throw new NotImplementedException ();\r
+                       return InnerList.Contains (value);\r
                }\r
                \r
-               [MonoTODO]\r
                public void Remove (DiscoveryReference value)\r
                {\r
-                        throw new NotImplementedException ();\r
+                       InnerList.Remove (value);\r
                }\r
 \r
                #endregion // Methods\r