From 1b5338dc5f32d1fc0491ddbe3b200f1eba112cff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Wed, 15 Mar 2017 17:21:25 +0100 Subject: [System.ServiceModel.Web] Rename method parameters to match .NET contract --- .../Atom10ItemFormatter.cs | 4 ++-- .../SyndicationContent.cs | 4 ++-- .../SyndicationItem.cs | 22 +++++++++++----------- .../XmlSyndicationContent.cs | 4 ++-- .../System.ServiceModel.Web/WebChannelFactory.cs | 8 ++++---- .../System.ServiceModel.Web/WebOperationContext.cs | 14 +++++++------- .../System.ServiceModel/WebHttpBinding.cs | 4 ++-- .../System/UriTemplateMatchException.cs | 4 ++-- 8 files changed, 32 insertions(+), 32 deletions(-) (limited to 'mcs/class/System.ServiceModel.Web') diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/Atom10ItemFormatter.cs b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/Atom10ItemFormatter.cs index 0c181289d25..7e2a31e73a3 100644 --- a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/Atom10ItemFormatter.cs +++ b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/Atom10ItemFormatter.cs @@ -64,8 +64,8 @@ namespace System.ServiceModel.Syndication { } - public Atom10ItemFormatter (SyndicationItem feedToWrite) - : base (feedToWrite) + public Atom10ItemFormatter (SyndicationItem itemToWrite) + : base (itemToWrite) { } diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/SyndicationContent.cs b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/SyndicationContent.cs index 1191c92b2be..1393a62493e 100644 --- a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/SyndicationContent.cs +++ b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/SyndicationContent.cs @@ -75,9 +75,9 @@ namespace System.ServiceModel.Syndication return new XmlSyndicationContent (null, xmlSerializerObject, serializer); } - public static XmlSyndicationContent CreateXmlContent (XmlReader reader) + public static XmlSyndicationContent CreateXmlContent (XmlReader xmlReader) { - return new XmlSyndicationContent (reader); + return new XmlSyndicationContent (xmlReader); } #endregion diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/SyndicationItem.cs b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/SyndicationItem.cs index 10f786c2ff3..1726b78eded 100644 --- a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/SyndicationItem.cs +++ b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/SyndicationItem.cs @@ -62,24 +62,24 @@ namespace System.ServiceModel.Syndication { } - public SyndicationItem (string title, string content, Uri feedAlternateLink) - : this (title, content, feedAlternateLink, null, default (DateTimeOffset)) + public SyndicationItem (string title, string content, Uri itemAlternateLink) + : this (title, content, itemAlternateLink, null, default (DateTimeOffset)) { } - public SyndicationItem (string title, string content, Uri feedAlternateLink, string id, + public SyndicationItem (string title, string content, Uri itemAlternateLink, string id, DateTimeOffset lastUpdatedTime) - : this (title, content != null ? SyndicationContent.CreatePlaintextContent (content) : null, feedAlternateLink, id, lastUpdatedTime) + : this (title, content != null ? SyndicationContent.CreatePlaintextContent (content) : null, itemAlternateLink, id, lastUpdatedTime) { } - public SyndicationItem (string title, SyndicationContent content, Uri feedAlternateLink, string id, + public SyndicationItem (string title, SyndicationContent content, Uri itemAlternateLink, string id, DateTimeOffset lastUpdatedTime) { Title = title != null ? new TextSyndicationContent (title) : null; Content = content; - if (feedAlternateLink != null) - AddPermalink (feedAlternateLink); + if (itemAlternateLink != null) + AddPermalink (itemAlternateLink); Id = id; LastUpdatedTime = lastUpdatedTime; } @@ -210,11 +210,11 @@ namespace System.ServiceModel.Syndication set { title = value; } } - public void AddPermalink (Uri link) + public void AddPermalink (Uri permalink) { - if (link == null) - throw new ArgumentNullException ("link"); - Links.Add (SyndicationLink.CreateAlternateLink (link)); + if (permalink == null) + throw new ArgumentNullException ("permalink"); + Links.Add (SyndicationLink.CreateAlternateLink (permalink)); } public virtual SyndicationItem Clone () diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/XmlSyndicationContent.cs b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/XmlSyndicationContent.cs index b380fd834ad..174f06b5840 100644 --- a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/XmlSyndicationContent.cs +++ b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/XmlSyndicationContent.cs @@ -119,9 +119,9 @@ namespace System.ServiceModel.Syndication return extension.GetObject (); } - public TContent ReadContent (XmlObjectSerializer serializer) + public TContent ReadContent (XmlObjectSerializer dataContractSerializer) { - return extension.GetObject (serializer); + return extension.GetObject (dataContractSerializer); } public TContent ReadContent (XmlSerializer serializer) diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/WebChannelFactory.cs b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/WebChannelFactory.cs index 4a5289dd51f..c05cf8f0c8e 100644 --- a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/WebChannelFactory.cs +++ b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/WebChannelFactory.cs @@ -56,13 +56,13 @@ namespace System.ServiceModel.Web } #endif - public WebChannelFactory(Type serviceType) - : base (serviceType) + public WebChannelFactory(Type channelType) + : base (channelType) { } - public WebChannelFactory (string configurationName) - : base (configurationName) + public WebChannelFactory (string endpointConfigurationName) + : base (endpointConfigurationName) { } diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/WebOperationContext.cs b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/WebOperationContext.cs index a372b24c6b6..3e8e500329a 100644 --- a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/WebOperationContext.cs +++ b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/WebOperationContext.cs @@ -68,15 +68,15 @@ namespace System.ServiceModel.Web OutgoingWebRequestContext outgoing_request; OutgoingWebResponseContext outgoing_response; - public WebOperationContext (OperationContext operation) + public WebOperationContext (OperationContext operationContext) { - if (operation == null) - throw new ArgumentNullException ("operation"); + if (operationContext == null) + throw new ArgumentNullException ("operationContext"); outgoing_request = new OutgoingWebRequestContext (); - incoming_response = new IncomingWebResponseContext (operation); + incoming_response = new IncomingWebResponseContext (operationContext); #if !MOBILE - incoming_request = new IncomingWebRequestContext (operation); + incoming_request = new IncomingWebRequestContext (operationContext); outgoing_response = new OutgoingWebResponseContext (); #endif } @@ -101,12 +101,12 @@ namespace System.ServiceModel.Web } #endif - public void Attach (OperationContext context) + public void Attach (OperationContext owner) { // do nothing } - public void Detach (OperationContext context) + public void Detach (OperationContext owner) { // do nothing } diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel/WebHttpBinding.cs b/mcs/class/System.ServiceModel.Web/System.ServiceModel/WebHttpBinding.cs index df3dd8f16f6..2a71219697d 100644 --- a/mcs/class/System.ServiceModel.Web/System.ServiceModel/WebHttpBinding.cs +++ b/mcs/class/System.ServiceModel.Web/System.ServiceModel/WebHttpBinding.cs @@ -45,9 +45,9 @@ namespace System.ServiceModel { } - public WebHttpBinding (WebHttpSecurityMode mode) + public WebHttpBinding (WebHttpSecurityMode securityMode) { - Initialize (mode); + Initialize (securityMode); } public WebHttpBinding (string configurationName) diff --git a/mcs/class/System.ServiceModel.Web/System/UriTemplateMatchException.cs b/mcs/class/System.ServiceModel.Web/System/UriTemplateMatchException.cs index 3a6629e57bc..60ddd555928 100644 --- a/mcs/class/System.ServiceModel.Web/System/UriTemplateMatchException.cs +++ b/mcs/class/System.ServiceModel.Web/System/UriTemplateMatchException.cs @@ -35,8 +35,8 @@ namespace System public class UriTemplateMatchException : SystemException { public UriTemplateMatchException () : base () {} - public UriTemplateMatchException (string msg) : base (msg) {} - public UriTemplateMatchException (string msg, Exception inner) : base (msg, inner) {} + public UriTemplateMatchException (string message) : base (message) {} + public UriTemplateMatchException (string message, Exception innerException) : base (message, innerException) {} protected UriTemplateMatchException (SerializationInfo info, StreamingContext context) : base (info, context) {} } -- cgit v1.2.3