X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Web.Services%2FSystem.Web.Services.Description%2FDocumentableItem.cs;h=4bcca149a747aaf74c6c92723f760b7df57ce467;hb=73c95bd9739369a5b5908f65076ba9a3df57a00e;hp=50bcea4b692a4229ce00ab8eb2b587a4efe875e6;hpb=0ca4c0c5ef6ba0bf13fd721deb36e7b501ec5829;p=mono.git diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/DocumentableItem.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/DocumentableItem.cs index 50bcea4b692..4bcca149a74 100644 --- a/mcs/class/System.Web.Services/System.Web.Services.Description/DocumentableItem.cs +++ b/mcs/class/System.Web.Services/System.Web.Services.Description/DocumentableItem.cs @@ -6,30 +6,29 @@ // // Copyright (C) Tim Coleman, 2002 // - -// -// 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. -// + +// +// 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. +// using System.ComponentModel; -using System.Runtime.InteropServices; using System.Xml.Serialization; using System.Xml; @@ -38,10 +37,10 @@ namespace System.Web.Services.Description { #region Fields - XmlElement docElement; + string documentation; #if NET_2_0 - XmlAttribute [] extAttributes; + XmlElement docElement; #endif #endregion // Fields @@ -50,12 +49,14 @@ namespace System.Web.Services.Description { protected DocumentableItem () { + documentation = String.Empty; } #endregion // Constructors #region Properties +#if NET_2_0 [XmlIgnore] public string Documentation { get { @@ -72,28 +73,28 @@ namespace System.Web.Services.Description { } } } - - [ComVisible (false)] + + [System.Runtime.InteropServices.ComVisible(false)] [XmlAnyElement (Name="documentation", Namespace="http://schemas.xmlsoap.org/wsdl/")] - public XmlElement DocumentationElement - { + public XmlElement DocumentationElement { get { return docElement; } set { docElement = value; } } - -#if NET_2_0 - [XmlAnyAttribute] - public XmlAttribute [] ExtensibleAttributes { - get { return extAttributes; } - set { extAttributes = value; } - } - - [XmlIgnore] - public abstract ServiceDescriptionFormatExtensionCollection Extensions { - get; +#else + [XmlElement ("documentation")] + [DefaultValue ("")] + public string Documentation { + get { return documentation; } + set { + if (value == null) + documentation = String.Empty; + else + documentation = value; + } } + #endif - + #endregion // Properties } }