mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.2.0.175

Browse Source 
Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-06-07 13:16:24 +00:00
parent 4bdbaf4a88
commit 966bba02bb
8776 changed files with 346420 additions and 149650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mcs/class/System.Design/System.ComponentModel.Design/ComponentDesigner.cs
View File

@ -408,10 +408,10 @@ namespace System.ComponentModel.Design
// Helper method - not an ISerivceProvider
//
protected virtual object GetService (Type service)
protected virtual object GetService (Type serviceType)
{
if (_component != null && _component.Site != null)
return _component.Site.GetService (service);
return _component.Site.GetService (serviceType);
return null;
}

8
mcs/class/System.Design/System.ComponentModel.Design/DesignSurfaceManager.cs
View File

@ -73,9 +73,9 @@ namespace System.ComponentModel.Design
{
}
public DesignSurfaceManager (IServiceProvider serviceProvider)
public DesignSurfaceManager (IServiceProvider parentProvider)
{
_parentProvider = serviceProvider;
_parentProvider = parentProvider;
this.ServiceContainer.AddService (typeof (IDesignerEventService), new DesignerEventService ());
}
@ -224,10 +224,10 @@ namespace System.ComponentModel.Design
}
public object GetService (Type service)
public object GetService (Type serviceType)
{
if (_serviceContainer != null)
return _serviceContainer.GetService (service);
return _serviceContainer.GetService (serviceType);
return null;
}

8
mcs/class/System.Design/System.ComponentModel.Design/EventBindingService.cs
View File

@ -50,8 +50,8 @@ namespace System.ComponentModel.Design
protected abstract bool ShowCode (IComponent component, EventDescriptor e, string methodName);
protected abstract bool ShowCode (int lineNumber);
protected abstract bool ShowCode ();
protected abstract string CreateUniqueMethodName (IComponent component, EventDescriptor eventDescriptor);
protected abstract ICollection GetCompatibleMethods (EventDescriptor eventDescriptor);
protected abstract string CreateUniqueMethodName (IComponent component, EventDescriptor e);
protected abstract ICollection GetCompatibleMethods (EventDescriptor e);
protected virtual void FreeMethod (IComponent component, EventDescriptor e, string methodName)
{
@ -67,10 +67,10 @@ namespace System.ComponentModel.Design
}
protected object GetService (Type service)
protected object GetService (Type serviceType)
{
if (_provider != null)
return _provider.GetService (service);
return _provider.GetService (serviceType);
return null;
}

8
mcs/class/System.Design/System.ComponentModel.Design/MenuCommandService.cs
View File

@ -210,12 +210,12 @@ namespace System.ComponentModel.Design
return false;
}
public virtual bool GlobalInvoke (CommandID commandID, object arg)
public virtual bool GlobalInvoke (CommandID commandId, object arg)
{
if (commandID == null)
throw new ArgumentNullException ("commandID");
if (commandId == null)
throw new ArgumentNullException ("commandId");
MenuCommand command = this.FindCommand (commandID);
MenuCommand command = this.FindCommand (commandId);
if (command != null) {
command.Invoke (arg);
return true;